aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2013-06-09 21:17:13 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2013-06-09 21:17:13 +0000
commitb1f9d0134dffbe07dded9a25370feb1cd55ea3af (patch)
tree42941e25acba65ce43f719d2a65219c15b65a6cb /doc
parentad6ae6f993fe840c52c6d12417ef396415d9cfdd (diff)
Back out the Makefile changes from r49865. The OSX buildbots don't like --utf8. Is the change to wireshark.pod.template sufficient?
svn path=/trunk/; revision=49866
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am1
-rw-r--r--doc/Makefile.nmake1
2 files changed, 0 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dcab1d717c..544b0d0e2e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -123,7 +123,6 @@ POD_CSS_URL ?= $(top_srcdir)/docbook/ws.css
$(AM_V_POD2MAN)$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
- --utf8 \
$< > $@
.pod.html: ../config.h $(top_srcdir)/docbook/ws.css
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index e227a56904..fd05767583 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -59,7 +59,6 @@ wireshark.1: wireshark.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
- --utf8 \
wireshark.pod > wireshark.1
wireshark.html: wireshark.pod ../config.h ws.css