current GNUmakefile.in,1.243,1.244

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28539

Modified Files:
	GNUmakefile.in 
Log Message:
Don't add '-src' to the name of the tar ball generated by the gen-dist target

The package isn't a source distribution but a binary package.

While at it, use a variable for the name to reduce the chances
that the various references get out of sync and fix the gen-upload
target which was looking in the wrong directory.


Index: GNUmakefile.in
===================================================================
RCS file: /cvsroot/ijbswa/current/GNUmakefile.in,v
retrieving revision 1.243
retrieving revision 1.244
diff -C2 -d -r1.243 -r1.244
*** GNUmakefile.in	10 Apr 2016 08:09:07 -0000	1.243
--- GNUmakefile.in	3 May 2016 13:20:58 -0000	1.244
***************
*** 163,166 ****
--- 163,167 ----
  
  TAR_ARCH = /tmp/privoxy-$(VERSION).tar.gz
+ GEN_DIST_TAR_NAME = privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS).tar
  
  #############################################################################
***************
*** 367,387 ****
  	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
  # add program
! 	(cd .. && $(TAR) --exclude "PACKAGERS" -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
  # add config files
  	for foo in $(CONFIG_FILES); do \
! 		(cd .. && $(TAR) --exclude "PACKAGERS" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
  	done;
  # add documentation
  	for foo in $(DOC_FILES); do \
! 		(cd .. && $(TAR) --exclude "PACKAGERS" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
  	done;
  # and zip the archive
  	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
! 	$(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar
  	@$(ECHO) Distribution with binary created.
  
  # anonymously ncftps the package to sourceforge
  gen-upload:
! 	ncftpput -u anonymous -p [email protected] upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz
  	@$(ECHO) -------------------------------------------------------
  	@$(ECHO) Now goto
--- 368,388 ----
  	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
  # add program
! 	(cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
  # add config files
  	for foo in $(CONFIG_FILES); do \
! 		(cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
  	done;
  # add documentation
  	for foo in $(DOC_FILES); do \
! 		(cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
  	done;
  # and zip the archive
  	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
! 	$(GZIP_PROG) ../$(GEN_DIST_TAR_NAME)
  	@$(ECHO) Distribution with binary created.
  
  # anonymously ncftps the package to sourceforge
  gen-upload:
! 	ncftpput -u anonymous -p [email protected] upload.sourceforge.net /incoming ../$(GEN_DIST_TAR_NAME).gz
  	@$(ECHO) -------------------------------------------------------
  	@$(ECHO) Now goto
***************
*** 392,396 ****
  # use with care
  gen-clean:
! 	$(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar*
  
  #############################################################################
--- 393,397 ----
  # use with care
  gen-clean:
! 	$(RM) ../$(GEN_DIST_TAR_NAME)*
  
  #############################################################################


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z