From 9796ff6831bfbf9b25870cb8d6595eb6ebe3eb7c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 17 Aug 2011 10:30:11 +0000 Subject: [PATCH] Revert the previous commit for now. Turns out that it broke a the dok targets. Ooops. --- GNUmakefile.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index f080a935..40e4cd55 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -274,7 +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#' default.action.master > $@ + $(GREP) -v '^#MASTER#' $< > $@ ############################################################################# # Win32 config files @@ -456,13 +456,13 @@ 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) +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 +else $(MAKE) groff2html - endif +endif # Build man page from sgml. This requires the SGMLSpm perl module. # See CPAN, or your favorite perl repository. This is the preferred @@ -481,7 +481,7 @@ man: dok-release # For those with man2html ala RH7s. man2html: mkdir -p doc/webserver/man-page - ifneq ($(MAN2HTML),false) +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 @@ -491,9 +491,9 @@ man2html: $(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 +else $(MAKE) groff2html - endif +endif # Otherwise we get plain groff conversion. @@ -549,19 +549,19 @@ dok-release: s///' \ doc/source/*sgml doc/source/*/*sgml $(RM) -r doc/source/*bak doc/source/*/*bak - ifeq ($(CODE_STATUS),stable) +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 +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 +endif # Create release announcement in text and html, with short and long versions. # This is a standalone target, and must be invoked directly. -- 2.39.2