X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=9e774c1f08b74d632870f887a757d3868c88bdb4;hb=fb489b1f10d9e84404f6029707364aa084278073;hp=04933670aab9a9d37feb522799128ca0ecda3a2e;hpb=061a6415261830282bd38413c631708e47d4cfef;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 04933670..9e774c1f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.8 2002/03/05 14:07:42 morcego Exp $
+# $Id: GNUmakefile.in,v 1.10 2002/03/06 14:19:35 sarantis Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,6 +28,12 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: GNUmakefile.in,v $
+# Revision 1.10  2002/03/06 14:19:35  sarantis
+# Cleanup PID_FILE_PATH from redhat-dist target
+#
+# Revision 1.9  2002/03/05 17:31:11  morcego
+# Search for docbook.dsl. Should solve portability problems for SuSe.
+#
 # Revision 1.8  2002/03/05 14:07:42  morcego
 # configure now detects rpm topdir, and change GNUmakefile acordingly
 #    (based on sugestion by Sarantis Paskalis)
@@ -281,6 +287,7 @@ DOSFILTER  = perl -p -e 's/\n/\r\n/'
 
 TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz
 RPM_BASE = @RPM_BASE@
+TMPFILE = mktemp -q /tmp/$(PROGRAM).XXXXXX
 
 #############################################################################
 # Filenames and libraries
@@ -414,12 +421,8 @@ redhat-dist:
 	done ; \
 	$(MAKE) clobber; \
 	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH); \
-	$(CAT) junkbuster-rh.spec | \
-		$(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \
-		$(MV) -f abc junkbuster-rh.spec; \
-	$(CAT) junkbuster.init | \
-		$(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \
-		$(MV) -f abc junkbuster.init; \
+	$(SED) 's/^\(Version:\).*/\1 $(RPM_VERSION)/g; \
+	        s/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' junkbuster-rh.spec > $(TMPFILE) && $(MV) -f $(TMPFILE) junkbuster-rh.spec; \
 	$(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \
 	$(RPM) --clean -ta  $(TAR_ARCH); \
 	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH)
@@ -453,7 +456,8 @@ suse-dist:
 # verify that i'm root needs to be done
 	rm -f ../ijbswa.tar.gz
 # verify all version strings, FLAGS, etc. in the spec file
-	cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-suse.spec
+	sed 's/^\(Version:\).*/\1: $(RPM_VERSION)/g; \
+	     s/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' junkbuster-suse.spec > $(TMPFILE) && mv -f $(TMPFILE) junkbuster-suse.spec
 	tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz .
 # verify all files in their correct location needs to be done
 # never use buildroot to define the location inside the spec