X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=452ef366e0fd3bc89400995a9897f0e1655045ad;hp=fbb51f706e2812aad5e60d241fa39360a2286577;hb=32b46035e19bb2bc06abdc318c9a85d135121f29;hpb=eb2483c15654a5257ef5b8f8a327da8e11b7ac44

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fbb51f70..452ef366 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.11 2002/03/06 14:33:18 sarantis Exp $
+# $Id: GNUmakefile.in,v 1.12 2002/03/07 15:28:27 swa 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.12  2002/03/07 15:28:27  swa
+# more informative
+#
 # Revision 1.11  2002/03/06 14:33:18  sarantis
 # Use proper temp file, not "abc".
 #
@@ -290,7 +293,6 @@ 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
@@ -416,21 +418,31 @@ re_filterfile.txt: re_filterfile
 #############################################################################
 
 redhat-dist:
-	@for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
+	for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
 		if [ ! -w $(RPM_BASE)/$$dir ]; then \
 			$(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \
 			$(ECHO) "Or add a suitable path to .rpmmacros like."; \
 			$(ECHO) "%_topdir /home/foo/rpm-build"; \
-			exit; \
+			exit 1; \
 		fi; \
-	done ; \
-	$(MAKE) clobber; \
-	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH); \
-	$(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)
+	done; \
+
+	$(MAKE) clobber
+	if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+
+	TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \
+	if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
+             -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \
+              junkbuster-rh.spec > $$TMPFILE ; then \
+      $(MV) -f $$TMPFILE junkbuster-rh.spec; \
+   else \
+      $(ECHO) "Could not set version info in specfile."; \
+      exit 1;\
+   fi
+
+	$(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -czf $(TAR_ARCH) .
+	$(RPM) --clean -ta  $(TAR_ARCH)
+	if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
 #
 # anonymously ncftps the rpms to sourceforge