[Octave-cvsupdate] octave-forge/packages Makefile,1.15,1.16

[David B. <ad...@us...>]

Update of /cvsroot/octave/octave-forge/packages
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5859

Modified Files:
	Makefile 
Log Message:
Modify mkbundle target to create a single tarball rather than three

Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/packages/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	9 Oct 2006 23:14:28 -0000	1.15
+++ Makefile	20 Oct 2006 20:22:43 -0000	1.16
@@ -9,20 +9,19 @@
   LOADPATH = $(MPATH)//:$(OPATH)//:
 endif
 RUN_OCTAVE= HOME=`pwd` $(TOPDIR)/admin/run_forge $(OCTAVE) -H -q --no-site-file
-PKGDIRS = $(filter-out packages, $(patsubst $(TOPDIR)/%/, %, $(dir $(wildcard $(TOPDIR)/*/Makefile))))
+PKGDIRS = $(filter-out packages www, $(patsubst $(TOPDIR)/%/, %, $(dir $(wildcard $(TOPDIR)/*/Makefile))))
 PACKAGES = $(filter $(patsubst %,%/%,$(PKGDIRS)), $(wildcard */*.tar.gz))
 TESTLOG=$(TOPDIR)/packages/fntests.log
 RPMDIR=RPM
 
 .PHONY: $(PKGDIRS) install
 
-# Construct the bundles from the individual packages
-all: $(patsubst %,mkbundle/%,$(PKGDIRS))
+# Construct the bundle from the individual packages
+all: mkbundle
 
-mkbundle/%:
+mkbundle:
 	@d=`date +%Y%m%d`; \
-	cd $(odir); \
-	tar cvzf ../octave-forge-$(odir)-$$d.tar.gz ../README *
+	tar cvzf octave-forge-bundle-$$d.tar.gz $(PKGDIRS)
 
 # Do nothing for the package target 
 package: