From a1102cb349d5075fd2a0eb93f9728793d2793219 Mon Sep 17 00:00:00 2001 From: Sarantis Paskalis Date: Wed, 6 Mar 2002 14:33:18 +0000 Subject: [PATCH] Use proper temp file, not "abc". --- GNUmakefile.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 1a66c75c..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.9 2002/03/05 17:31:11 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,9 @@ # 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. # @@ -284,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 @@ -417,9 +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; \ + $(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 -- 2.39.2