Add redhat-test target for testing purposes only. Fix RPM_PACKAGEV to what

*I think* it was supposed to be (was breaking upload targets since it was
set to RPM_VERSION).

diff --git a/GNUmakefile.in b/GNUmakefile.in
index dca3094..018d73f 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.104.2.9 2002/07/26 15:17:02 oes Exp $
+# $Id: GNUmakefile.in,v 1.104.2.10 2002/07/27 22:56:53 kick_ Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -43,8 +43,8 @@ VERSION_POINT = @VERSION_POINT@
 CODE_STATUS   = @CODE_STATUS@
 VERSION       = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
 RPM_VERSION   = $(VERSION)
-RPM_PACKAGEV  = $(RPM_VERSION)
-SNAPVERSION   = $(RPM_PACKAGEV)-$(shell date "+%Y%m%d")
+RPM_PACKAGEV  = ""
+SNAPVERSION   = $(RPM_VERSION)-$(shell date "+%Y%m%d")
 
 
 #############################################################################
@@ -390,11 +390,19 @@ conectiva-upload: check-release
 # redhat distribution alpha and x86
 #############################################################################
 redhat-dist: rpm-stuff
-
+       echo $(CONFIG_FILES)
        $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
        $(RPMBUILD) --clean -ta  $(TAR_ARCH)
        if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
+# For testing build issues only! Use redhat-dist for official releases.
+redhat-test: 
+       echo $(CONFIG_FILES)
+       $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+       $(RPMBUILD) --clean -tb  $(TAR_ARCH)
+       if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
+       @echo "WARNING: This target is only for testing. Use redhat-dist for releases!!!"
+
 # anonymously ncftps the rpms to sourceforge
 redhat-upload: check-release
        ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
@@ -971,6 +979,9 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.104.2.10  2002/07/27 22:56:53  kick_
+# cleanups of the redhat-srpm target
+#
 # Revision 1.104.2.9  2002/07/26 15:17:02  oes
 # - Added generation of default.action from defaul.action.master
 # - Deleted obsolete re_filterfile.txt generation