X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=bbd626e41dd7a8d05b45081d6a4b7c0c92c6951f;hp=64c3805d70a45634bbdc7acdde00d9426346456f;hb=802ee517a80ddfc91e1e2edaf8247092f8dee546;hpb=dcd0697f82133864e459774116055509faad4e89

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 64c3805d..bbd626e4 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.141 2006/08/12 03:54:37 david__schmidt Exp $
+# $Id: GNUmakefile.in,v 1.148 2006/09/26 10:57:58 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 - 2004 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -153,7 +153,7 @@ DOC_STATUS = @DOC_STATUS@
 #DOSFILTER  = $(SED) -e $$'s,$$,\r,'
 #DOSFILTER  = gawk -v ORS='\r\n' '{print $0;}'
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
-CVSROOT    = :pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa
+CVSROOT    = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa
 #TMPDIR     := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
 
 #############################################################################
@@ -333,12 +333,12 @@ dist-check:
 # This creates a tar.gz and spec-file for a Red Hat 6.x version.
 #############################################################################
 create-snapshot:
-	TMPDIR=$(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
 	@tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \
 	[ x"$$tag" = x"(none)" ] && tag=HEAD; \
 	echo "*** Creating package from $$tag!"; \
-	cd $(TMPDIR) ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted."
-	@cd $(TMPDIR)/current; \
+	TMPDIR=$(shell mktemp -d /tmp/$(PROGRAM).XXXXXX); \
+	cd $$TMPDIR ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted."; \
+	cd $$TMPDIR/current; \
 	TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \
 	if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
 		-e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \
@@ -356,17 +356,12 @@ create-snapshot:
 		$(ECHO) "Could not set version info in specfile."; \
 		exit 1;\
 	fi; \
-	$(RM) $(TMPFILE); \
-	cd $(TMPDIR)/current; \
-	$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \
-		"privoxy-suse.spec" -czf $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .; \
-	$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \
-		"privoxy-rh.spec" -czf $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz .
-	@$(MV) -f $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .
-	@$(MV) -f $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz .
-	@$(RM) -rf $(TMPDIR)
-	@echo "Resulting files are $(PROGRAM)-rh-$(VERSION).tar.gz and"
-	@echo "                    $(PROGRAM)-suse-$(VERSION).tar.gz"
+	$(RM) $$TMPFILE; \
+	cd $$TMPDIR/current; \
+	$(TAR) --exclude ".cvsignore" --exclude "CVS" \
+		-czf /tmp/$(PROGRAM)-$(VERSION).tar.gz .; \
+	$(RM) -rf $$TMPDIR
+	@echo "Resulting file is /tmp/$(PROGRAM)-$(VERSION).tar.gz"
 
 
 #############################################################################
@@ -469,7 +464,6 @@ redhat-upload: check-release
 #############################################################################
 redhat-srpm: 
 	make create-archive
-	$(MV) $(PROGRAM)-rh-$(VERSION).tar.gz $(PROGRAM)-$(VERSION).tar.gz
 	$(RPMBUILD) -ts --nodeps $(PROGRAM)-$(VERSION).tar.gz
 
 
@@ -678,6 +672,10 @@ dok-user:
 	$(RM) -r doc/source/user-manual/
 	mkdir -p doc/text doc/source/user-manual
 	cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
+	@#FIXME: temp fix so same stylesheet gets in more than one place so it works \
+	@# for all doc set-ups, including the 'user manual' config option in local \
+	@#system where it MUST be in same directory as html.
+	$(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
 	cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual
 
 # faq
@@ -823,7 +821,7 @@ dok-pdf: dok-shtml
 	if htmldoc --version ; then : ; \
 	   else $(ECHO) "WARNING: could not get htmldoc version" ; fi
 	cd utils/ldp_print && $(RM) *html *bak *jpg *tmp *pdf *zip
-	cp -f doc/source/temp/*html doc/webserver/images/*jpg utils/ldp_print
+	cp -f doc/source/temp/*html doc/webserver/user-manual/*jpg utils/ldp_print
 	cd utils/ldp_print ;\
 	$(PERL) -pi.bak -e 's/\.\.\/images\///; s/(<\/?)SUB/$$1small/i;\
 	                    s/\.\.\/user-manual\/index\.html/privoxy-user-manual.pdf/;\
@@ -1012,7 +1010,7 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 	$(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 
 clean:
-	$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` 
+	$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` config.base config.tmp
 
 tidy:
 	$(RM) `find . -name "*~"`
@@ -1021,7 +1019,7 @@ tidy:
 
 clobber: tidy
 	$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
-              privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
+              privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl config.new
 	$(RM) -r autom4te.cache
 
 #
@@ -1074,7 +1072,7 @@ install-strip:
 # FIXME: id handling needs help, probably via configure, since 'id -u' is not 
 # universally reliable (eg Solaris). Group handling could be better. 
 # Perhaps the whole user/group validation should be done here, and simplified.
-PROGRAM_V = Privoxy $(VERSION)
+PROGRAM_V = Privoxy $(VERSION) $(CODE_STATUS)
 install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	@# Quick test for valid USER.
 	@if [ -n "$(USER)" ]; then \
@@ -1097,6 +1095,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	$(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
      
 	@# Install the DOCS and man page. install-sh only does one file at a time.
+	@# FIXME: only handles jpegs.
 	-@if [ $(check_doc) = 0 ]; then \
 		DOC=$(DOC_DEST) ;\
 	else \
@@ -1111,8 +1110,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
                     $(INSTALL) $(INSTALL_T) $$ii $$DOC/$$i;\
                done ;\
           done ;\
-          for i in $(DOK_WEB)/images/*jpg; do \
-               $(INSTALL) $(INSTALL_T) $$i $$DOC/images;\
+		for i in $(DOK_WEB)/user-manual/*jpg; do \
+               $(INSTALL) $(INSTALL_T) $$i $$DOC/user-manual;\
           done ;\
 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $$DOC/man-page;\
 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $$DOC/index.html;\
@@ -1121,6 +1120,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 		$(INSTALL) $(INSTALL_T) README $$DOC;\
 		$(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\
 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\
+		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
 	fi
 	@# Not all platforms support gzipped man pages.
 	@$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
@@ -1133,7 +1133,12 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 		$(MV) config.base config ;\
 	fi
 	$(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \
-	$(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated
+	$(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.tmp
+	-@if [ $(check_doc) = 0 ]; then \
+      $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\
+	else \
+      $(SED) 's+^#\?user-manual .*+user-manual $(prefix)/doc/privoxy/user-manual/+' config.tmp >config.updated ;\
+	fi;\
 	$(MV) config config.base
 	$(MV) config.updated config 
 
@@ -1182,7 +1187,11 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	fi ;\
 	$(ECHO) Installing configuration files to $(CONF_DEST);\
 	for i in $(CONFIGS); do \
-		if [ -s "$(CONF_DEST)/$$i" ] ; then \
+		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
+			$(RM) $(CONF_DEST)/$$i ;\
+			$(ECHO) Installing fresh $$i;\
+			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
+		elif [ -s "$(CONF_DEST)/$$i" ]; then \
 			$(ECHO) Installing $$i as $$i.new ;\
 			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
 			NEW=1;\
@@ -1233,6 +1242,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	else \
 		$(ECHO) "No init script installed, install it manually if needed" ;\
 	fi
+	$(RM) config.base config.tmp
 	@# mmmmm, good.
 	@$(ECHO) "$(PROGRAM_V) installation succeeded!"
 	@$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
@@ -1345,6 +1355,35 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.148  2006/09/26 10:57:58  hal9
+# Including Karsten's patch to fix make create-snapshot.
+#
+# Revision 1.147  2006/09/13 01:25:16  hal9
+# Make sure install forces in new default.action, default.filter, and
+# standard.filter. These are privoxy files, not user files.
+#
+# Revision 1.146  2006/09/08 23:57:19  hal9
+# User manual images are now user-manual doc directory, and fix make install
+# target accordingly.
+#
+# Revision 1.145  2006/09/08 02:32:00  hal9
+# Various changes to implement building and installing docs to be compatible
+# with the new "user-manual" settings in config from Roland. Docbook does not
+# seem to like dealing with more than one css file, so workaround that here.
+# Change 'make install' so it provides p_doc.css in the user-manual doc
+# directory so that functions well, and lastly modify 'make install' so that the
+# PATH is automatically set, and the 'user-manual' directive should done during
+# the install.
+#
+# Revision 1.144  2006/09/07 22:53:20  hal9
+# Make sure config sgml build related artifacts are cleaned out.
+#
+# Revision 1.143  2006/09/02 15:59:40  hal9
+# Add to code status to make install output.
+#
+# Revision 1.142  2006/08/29 01:46:24  hal9
+# Add user.filter to $CONFIGS.
+#
 # Revision 1.141  2006/08/12 03:54:37  david__schmidt
 # Windows service integration
 #