--- privoxy~/GNUmakefile.in
+++ privoxy/GNUmakefile.in
@@ -177,7 +177,7 @@
- `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \
+ DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \
`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
`find doc/webserver/ -name "*.css"` \
-- privoxy.1 \
-+ privoxy.8 \
- doc/pdf/*.pdf
+- privoxy.1
++ privoxy.8
#############################################################################
-@@ -521,7 +521,7 @@
+ # Filenames and libraries
+@@ -513,7 +513,7 @@
$(RM) /etc/init.d/privoxy
$(RM) /usr/sbin/privoxy
$(RM) /usr/sbin/rcprivoxy
#############################################################################
# generic distribution
-@@ -697,7 +697,7 @@
+@@ -686,7 +686,7 @@
$(RM) doc/man/* doc/webserver/man-page/*.html
ifneq ($(MAN2HTML),false)
$(ECHO) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
$(ECHO) "</body></html>" >> doc/webserver/man-page/privoxy-man-page.html
else
$(MAKE) groff2html
-@@ -709,14 +709,14 @@
+@@ -698,19 +698,19 @@
man: dok-release
mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
- perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.1 ;\
+- perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.1; \
+- perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.1; \
+- perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.1; \
+- perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.1; \
+- perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.1; \
- $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1
+ perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.8 ;\
++ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.8; \
++ perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.8; \
++ perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.8; \
++ perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.8; \
++ perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.8; \
+ $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.8 ../../../privoxy.8
# For those with man2html ala RH7s.
$(PERL) -pi.bak -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
$(PERL) -pi.bak -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/HEAD>/' tmp.html
# Twice because my version of man2html is pulling in commas and periods in URLs.
-@@ -731,7 +731,7 @@
+@@ -726,7 +726,7 @@
# Otherwise we get plain groff conversion.
groff2html:
# readme page and INSTALL file
-@@ -1129,8 +1129,8 @@
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
+@@ -1079,8 +1079,8 @@
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC/user-manual;\
fi
@# Not all platforms support gzipped man pages.
-- @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
-- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1
-+ @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.8
-+ -$(INSTALL) $(INSTALL_T) privoxy.8 $(MAN_DEST)/privoxy.8
+- @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1
+- -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1
++ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.8
++ -$(INSTALL) $(INSTALL_T) privoxy.8 $(DESTDIR)$(MAN_DEST)/privoxy.8
@# Change the config file default directories according to the configured ones
@$(ECHO) Rewriting config for this installation
-@@ -1286,7 +1286,7 @@
+@@ -1241,7 +1241,7 @@
@# man page and docs
@$(ECHO) Removing $(PROGRAM) docs
-- -$(RM) $(MAN_DEST)/privoxy.1*
-+ -$(RM) $(MAN_DEST)/privoxy.8*
- -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy
+- -$(RM) $(DESTDIR)$(MAN_DEST)/privoxy.1*
++ -$(RM) $(DESTDIR)$(MAN_DEST)/privoxy.8*
+ -$(RM) -r $(DESTDIR)$(DOC_DEST) || $(RM) -r $(DESTDIR)$(prefix)/doc/privoxy
- @# Log and jarfile and pidfile
+ @# Log and pidfile
diff -urNad privoxy~/doc/source/privoxy-man-page.sgml privoxy/doc/source/privoxy-man-page.sgml
--- privoxy~/doc/source/privoxy-man-page.sgml
+++ privoxy/doc/source/privoxy-man-page.sgml
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
</refentryinfo>
<refmeta>
<refentrytitle>privoxy</refentrytitle>