Privoxy Man page

From: Fabian Keil Date: Fri, 26 Aug 2011 16:11:59 +0000 (+0000) Subject: Once more, with feeling: GNUisms be gone X-Git-Tag: v_3_0_18~126 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=49e0a6b642b7a5613af7ebeee245f34c5b0b44be Once more, with feeling: GNUisms be gone This time the dok target has actually been tested on a GNU/Linux system using GNU make. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 40e4cd55..8a80311b 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.195 2011/01/22 12:33:11 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.197 2011/08/17 10:30:11 fabiankeil Exp $ # # Written by and Copyright (C) 2001-2010 members of the # Privoxy team. http://www.privoxy.org/ @@ -274,8 +274,7 @@ PID_DEST check_doc install-strip uninstall GROUP_T # Strip master copy comments from default.action: ############################################################################# default.action: default.action.master - $(GREP) -v '^#MASTER#' $< > $@ - + $(GREP) -v '^#MASTER#' default.action.master > $@ ############################################################################# # Win32 config files ############################################################################# @@ -456,13 +455,14 @@ dok-faq: # man page, one variation. Try to use the next target, just 'make man'. dok-man: $(RM) doc/man/* doc/webserver/man-page/*.html -ifneq ($(MAN2HTML),false) - $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html - man ./$(MAN_PAGE) | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html - $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html -else - $(MAKE) groff2html -endif + echo MAN2HTML is $(MAN2HTML) + @if [ $(MAN2HTML) != "false" ]; then \ + $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html; \ + man ./$(MAN_PAGE) | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html; \ + $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html; \ + else \ + $(MAKE) groff2html; \ + fi; # Build man page from sgml. This requires the SGMLSpm perl module. # See CPAN, or your favorite perl repository. This is the preferred @@ -481,20 +481,17 @@ man: dok-release # For those with man2html ala RH7s. man2html: mkdir -p doc/webserver/man-page -ifneq ($(MAN2HTML),false) - $(MAN2HTML) $(MAN_PAGE) |grep -v "^Content-type" > tmp.html - $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html - $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html -# Twice because my version of man2html is pulling in commas and periods in URLs. - $(PERL) -pi.bak -e 's/()/$$1$$2/g' tmp.html - $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html - $(PERL) -pi.bak -e "s/\['a\]/\á/g;s/\['e\]/\é/g" tmp.html -# Get rid of spurious from conversion. (How to do this with perl?) - $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.* -else - $(MAKE) groff2html -endif - + @if [ $(MAN2HTML) != "false" ]; then \ + $(MAN2HTML) $(MAN_PAGE) |grep -v "^Content-type" > tmp.html; \ + $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html; \ + $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html; \ + $(PERL) -pi.bak -e 's/()/$$1$$2/g' tmp.html; \ + $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html; \ + $(PERL) -pi.bak -e "s/\['a\]/\á/g;s/\['e\]/\é/g" tmp.html; \ + $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.*; \ + else \ + $(MAKE) groff2html; \ + fi; # Otherwise we get plain groff conversion. groff2html: @@ -549,19 +546,19 @@ dok-release: s///' \ doc/source/*sgml doc/source/*/*sgml $(RM) -r doc/source/*bak doc/source/*/*bak -ifeq ($(CODE_STATUS),stable) - @$(ECHO) Setting docs to stable $(VERSION) - @$(PERL) -pi.bak -e 's///;\ - s///' \ - doc/source/*sgml doc/source/*/*sgml - $(RM) -r doc/source/*bak doc/source/*/*bak -else - @$(ECHO) Setting docs to not stable $(VERSION) - @$(PERL) -pi.bak -e 's///;\ - s///' \ - doc/source/*sgml doc/source/*/*sgml - $(RM) -r doc/source/*bak doc/source/*/*bak -endif + @if [ $(CODE_STATUS) = "stable" ]; then \ + $(ECHO) Setting docs to stable $(VERSION); \ + $(PERL) -pi.bak -e 's///;\ + s///' \ + doc/source/*sgml doc/source/*/*sgml; \ + $(RM) -r doc/source/*bak doc/source/*/*bak; \ + else \ + $(ECHO) Setting docs to not stable $(VERSION); \ + $(PERL) -pi.bak -e 's///; \ + s///' \ + doc/source/*sgml doc/source/*/*sgml; \ + $(RM) -r doc/source/*bak doc/source/*/*bak; \ + fi; # Create release announcement in text and html, with short and long versions. # This is a standalone target, and must be invoked directly.