X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=f080a93506d8ff8c5e57aa1e8a2eba8685c3c304;hp=950955b3839133bc2ef692d82f21535674db7819;hb=287b4fa8824336baf03b0f5632d878d1b55aeddc;hpb=37bb82a77fe37786893e9068c046230cb0c06312
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 950955b3..f080a935 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.194 2010/11/14 15:02:07 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.195 2011/01/22 12:33:11 fabiankeil Exp $
#
# Written by and Copyright (C) 2001-2010 members of the
# Privoxy team. http://www.privoxy.org/
@@ -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#' $< > $@
+ $(GREP) -v '^#MASTER#' default.action.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 pageNAME
" > 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 @@ ifneq ($(MAN2HTML),false)
$(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.