[Privoxy-commits] [privoxy] 02/10: Move the Privoxy man page into a 'man' directory

Sat Apr 11 15:04:11 CEST 2026

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository privoxy.

commit 7c0ad9e1c659c52a5dd96d7cb312e7528a81b806
Author: Fabian Keil <fk at fabiankeil.de>
AuthorDate: Sat Apr 11 12:34:23 2026 +0200

    Move the Privoxy man page into a 'man' directory
---
 GNUmakefile.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index afae95cb..71f4d549 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -204,7 +204,7 @@ CONFIG_FILES = $(CONFIGS) \
 DOC_FILES = AUTHORS LICENSE LICENSE.GPLv3 README ChangeLog INSTALL \
 		`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \
 		`find doc/webserver/ -name "*.css" | sort` \
-                $(PRIVOXY_MAN_PAGE)
+                man/$(PRIVOXY_MAN_PAGE)
 
 #############################################################################
 # Filenames and libraries
@@ -528,7 +528,7 @@ dok-man:
 	echo MAN2HTML is $(MAN2HTML)
 	@if [ $(MAN2HTML) != "false" ]; then \
 		$(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; \
-		man ./$(PRIVOXY_MAN_PAGE) | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html; \
+		man ./man/$(PRIVOXY_MAN_PAGE) | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html; \
 		$(ECHO) "</body></html>" >> doc/webserver/man-page/privoxy-man-page.html; \
 	else \
 		$(MAKE) groff2html; \
@@ -540,19 +540,19 @@ dok-man:
 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_MAN_PAGE) ;\
-	perl -pi.bak -e "s/\[ /\[/g;s/�/\\\\['a]/g;s/�/\\\\['e]/g" $(PRIVOXY_MAN_PAGE); \
-	perl -pi.bak -e "s/�/\\\\[:o]/g" $(PRIVOXY_MAN_PAGE); \
-	perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(PRIVOXY_MAN_PAGE); \
-	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(PRIVOXY_MAN_PAGE); \
-	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(PRIVOXY_MAN_PAGE); \
-	$(DB) ../privoxy-man-page.sgml && $(MV) -f $(PRIVOXY_MAN_PAGE) ../../../$(PRIVOXY_MAN_PAGE)
+	perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' man/$(PRIVOXY_MAN_PAGE) ;\
+	perl -pi.bak -e "s/\[ /\[/g;s/�/\\\\['a]/g;s/�/\\\\['e]/g" man/$(PRIVOXY_MAN_PAGE); \
+	perl -pi.bak -e "s/�/\\\\[:o]/g" man/$(PRIVOXY_MAN_PAGE); \
+	perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' man/$(PRIVOXY_MAN_PAGE); \
+	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' man/$(PRIVOXY_MAN_PAGE); \
+	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' man/$(PRIVOXY_MAN_PAGE); \
+	$(DB) ../privoxy-man-page.sgml && $(MV) -f man/$(PRIVOXY_MAN_PAGE) ../../../$(PRIVOXY_MAN_PAGE)
 
 # For those with man2html ala RH7s.
 man2html:
 	mkdir -p doc/webserver/man-page
 	@if [ $(MAN2HTML) != "false" ]; then \
-		$(MAN2HTML) $(PRIVOXY_MAN_PAGE) |grep -v "^Content-type" > tmp.html; \
+		$(MAN2HTML) man/$(PRIVOXY_MAN_PAGE) |grep -v "^Content-type" > tmp.html; \
 		$(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; \
 		$(PERL) -pi.bak -e 's/(<A.*),(">)/$$1$$2/g' tmp.html; \
@@ -565,7 +565,7 @@ man2html:
 
 # Otherwise we get plain groff conversion.
 groff2html:
-	$(G2H_CMD) ./$(PRIVOXY_MAN_PAGE) | $(SED) -e 's@</head>@<link REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></head>@' > doc/webserver/man-page/privoxy-man-page.html
+	$(G2H_CMD) ./man/$(PRIVOXY_MAN_PAGE) | $(SED) -e 's@</head>@<link REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></head>@' > doc/webserver/man-page/privoxy-man-page.html
 
 
 # readme page and INSTALL file
@@ -893,7 +893,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	fi
 	@# Not all platforms support gzipped man pages.
 	@$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/$(PRIVOXY_MAN_PAGE)
-	-$(INSTALL) $(INSTALL_T) $(PRIVOXY_MAN_PAGE)  $(DESTDIR)$(MAN_DEST)/$(PRIVOXY_MAN_PAGE)
+	-$(INSTALL) $(INSTALL_T) man/$(PRIVOXY_MAN_PAGE)  $(DESTDIR)$(MAN_DEST)/$(PRIVOXY_MAN_PAGE)
 
 	@# Change the config file default directories according to the configured ones
 	@$(ECHO) Rewriting config for this installation

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
