From 00e45dfbb1f93939a9c8691d3fe53d9a8f3a7bf0 Mon Sep 17 00:00:00 2001 From: hal9 Date: Tue, 26 Sep 2006 10:57:58 +0000 Subject: [PATCH] Including Karsten's patch to fix make create-snapshot. --- GNUmakefile.in | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index f1b11559..2d62fd42 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.146 2006/09/08 23:57:19 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.147 2006/09/13 01:25:16 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 @@ -1361,6 +1355,10 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# 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. -- 2.39.2