[fU-cvs] libfunutil/toc/make dist.make,1.9,1.10

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv19946/toc/make

Modified Files:
	dist.make 
Log Message:
fixed a bogus directory display bug.

Index: dist.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/dist.make,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dist.make	31 Aug 2003 00:46:07 -0000	1.9
+++ dist.make	31 Aug 2003 20:23:28 -0000	1.10
@@ -37,12 +37,14 @@
 dist-tar: $(DIST_FILES_TARBALL)
 $(DIST_FILES_TARBALL): $(DIST_FILES_FILE)
 	@echo "Making dist tarball..."; \
-		pwd=$$(pwd); \
+		cd $(top_srcdir) > /dev/null; \
+		top=$$(pwd); \
+		cd - > /dev/null; \
 		tmpfile=.toc.DIST_FILES.toplevel; \
 		echo '' > $$tmpfile; \
 		find . -name $(DIST_FILES_FILE) | \
 			xargs cat >> $$tmpfile; \
-			perl -pe "s|$${pwd}/||" $$tmpfile > foo.bar; \
+			perl -pe "s|$${top}/||" $$tmpfile > foo.bar; \
 				sort < foo.bar > $$tmpfile; rm foo.bar; \
 		$(TOC_MAKEDIST_BIN) $$tmpfile $@ || exit; \
 		rm $$tmpfile
@@ -50,13 +52,20 @@
 dist-compress:
 dist-.: $(DIST_FILES_TARBALL) dist-compress
 
-configure_dist_use_gzip ?= 1
+configure_dist_use_gzip ?= 0
 configure_dist_use_bzip ?= 0
 configure_dist_use_zip ?= 0
+
+GZIP_BIN = $(call dist_find_bin,gzip)
+ifneq (,$(GZIP_BIN))
+configure_dist_use_gzip = 1
+endif
+
 BZIP_BIN = $(call dist_find_bin,bzip2)
 ifneq (,$(BZIP_BIN))
 configure_dist_use_bzip = 1
 endif
+
 ZIP_BIN = $(call dist_find_bin,zip)
 ifneq (,$(ZIP_BIN))
 configure_dist_use_zip = 1
@@ -68,7 +77,7 @@
 dist-gzip: dist dist-tarball-gzip
 dist-tarball-gzip: $(DIST_FILES_TARBALL).gz
 $(DIST_FILES_TARBALL).gz: $(DIST_FILES_TARBALL)
-	gzip -c $< > $@
+	$(GZIP_BIN) -c $< > $@
 endif
 # ^^^ end gzip
 
@@ -78,7 +87,7 @@
 dist-bzip: dist dist-tarball-bzip
 dist-tarball-bzip: $(DIST_FILES_TARBALL).bz2
 $(DIST_FILES_TARBALL).bz2: $(DIST_FILES_TARBALL)
-	bzip2 -c $< > $@
+	$(BZIP_BIN) -c $< > $@
 endif
 # ^^^ end bzip
 
@@ -91,7 +100,7 @@
 $(DIST_TARBALL_ZIP): $(DIST_FILES_TARBALL)
 	@test -d $(DIST_NAME) && rm -fr $(DIST_NAME); true
 	@tar xf $<
-	zip -qr $@ $(DIST_NAME)
+	$(ZIP_BIN) -qr $@ $(DIST_NAME)
 	@rm -fr $(DIST_NAME)
 endif
 # ^^^ end infozip
@@ -114,25 +123,18 @@
 		./configure $(DIST_TESTDIST_ARGS) && make || exit $$?
 	@echo "$@ $(PACKAGE_NAME)-$(PACKAGE_VERSION) completed. $(TOC_EMOTICON_OKAY)"
 
-# MD5_BIN = md5sum
-# MD5_LIST = MD5SUMS.$(DIST_NAME)
-# $(MD5_LIST): $(DIST_FILES_TARBALL)
-# 	@-rm $@ 2>&1 > /dev/null;
-# 	@echo "Creating $@..."; \
-# 	for m in $$(tar tf $(DIST_FILES_TARBALL) | sed -e 's|$(DIST_NAME)/||'); do \
-# 		test -d $$m && continue; \
-# 		$(MD5_BIN) $$m; \
-# 	done > $@
-
 MD5_BIN = $(call dist_find_bin,md5sum*)
 ifeq (,$(MD5_BIN))
 $(warning MD5_BIN not pointing to md5sum application. Skipping md5-related checks.)
 else
-MD5_LIST = MD5SUMS.$(DIST_NAME)
-dist-checkmd5:
-	@echo "Checking distribution md5 sums against $(MD5_LIST)..."
-	@$(MD5_BIN) --check $(MD5_LIST) | grep FAILED || exit 0 && exit 1
+MD5_LIST = md5.sums.$(DIST_NAME)
+
+md5check-%:
+	@echo "Checking distribution md5 sums against $*..."
+	@$(MD5_BIN) --check $* | grep FAILED || exit 0 && exit 1
 	@echo "${TOC_EMOTICON_OKAY}"
+md5check: md5check-$(MD5_LIST)
+
 endif
 # ^^^ end md5 stuff