X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=2102f42d93cd85664b20ddd4a37f87defd0bca68;hp=fbb51f706e2812aad5e60d241fa39360a2286577;hb=547dfbe97d8f410da968adb5a1f05183312aa968;hpb=9439110b5f3ffb98cee1e1ad1d3e62b14096a033

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fbb51f70..2102f42d 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.14 2002/03/07 18:25:56 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,6 +28,15 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: GNUmakefile.in,v $
+# Revision 1.14  2002/03/07 18:25:56  swa
+# synced redhat and suse build process
+#
+# Revision 1.13  2002/03/07 17:17:56  oes
+# (Hopefully) fixed for older make versions
+#
+# 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 +299,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 +424,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
@@ -457,19 +475,31 @@ solaris-dist:
 #############################################################################
 
 suse-dist:
-	@make clobber
-# verify that i'm root needs to be done
-	rm -f ../ijbswa.tar.gz
-# verify all version strings, FLAGS, etc. in the spec file
-	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
-# file or suse will fuck up the build process.
-	cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz
-	chmod a+r /usr/src/packages/SRPMS/*
-	chmod a+r /usr/src/packages/RPMS/i386/*
+	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 1; \
+		fi; \
+	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-suse.spec > $$TMPFILE ; then \
+      $(MV) -f $$TMPFILE junkbuster-suse.spec; \
+   else \
+      $(ECHO) "Could not set version info in specfile."; \
+      exit 1;\
+   fi
+
+	$(TAR) --exclude "CVS" --exclude "junkbuster-rh.spec" -czf $(TAR_ARCH) .
+	$(RPM) --clean -ta  $(TAR_ARCH)
+	if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
 #
 # anonymously ncftps the rpms to sourceforge
@@ -488,6 +518,8 @@ suse-upload:
 suse-clean:
 	rpm -e junkbuster-suse
 	rm -rf /etc/junkbuster
+	rm -rf /etc/rc.d/junkbuster*
+	rm -rf /var/run/junkbuster.pid 
 	rm -rf /var/log/junkbuster
 	rm -f /etc/init.d/junkbuster
 	rm -f /usr/sbin/junkbuster