From: Jim Meyering <meyering@redhat.com>
Date: Sat, 1 Oct 2011 15:33:42 +0000 (+0200)
Subject: maint.mk: adjust a release-related rule not to require use of gzip
X-Git-Tag: v0.1~1715
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=244794a7887f13d9cdb91fed96932cc479905b96

maint.mk: adjust a release-related rule not to require use of gzip

* top/maint.mk (writable-files): Don't hard-code use of .tar.gz.
Instead, check each file in $(DIST_ARCHIVES).  This is better for
projects that build only .tar.xz files.  Also fix an erroneous test.
---

diff --git a/ChangeLog b/ChangeLog
index 7ad4703bb..a6d363a7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-01  Jim Meyering  <meyering@redhat.com>
 
+	maint.mk: adjust a release-related rule not to require use of gzip
+	* top/maint.mk (writable-files): Don't hard-code use of .tar.gz.
+	Instead, check each file in $(DIST_ARCHIVES).  This is better for
+	projects that build only .tar.xz files.  Also fix an erroneous test.
+
 	test-linkat: don't leave behind a temporary file
 	* tests/test-linkat.c (main): Don't forget to remove a temporary file.
 	Otherwise, coreutils' "make distcheck" would fail with this:
diff --git a/top/maint.mk b/top/maint.mk
index 0137df10f..51f617bb4 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1079,16 +1079,20 @@ sc_makefile_path_separator_check:
 	halt=$(msg)							\
 	  $(_sc_search_regexp)
 
-# Check that `make alpha' will not fail at the end of the process.
+# Check that `make alpha' will not fail at the end of the process,
+# i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
+# and is read-only.
 writable-files:
-	if test -d $(release_archive_dir); then :; else			\
-	  for file in $(distdir).tar.gz					\
-		      $(release_archive_dir)/$(distdir).tar.gz; do	\
-	    test -e $$file || continue;					\
-	    test -w $$file						\
-	      || { echo ERROR: $$file is not writable; fail=1; };	\
+	if test -d $(release_archive_dir); then				\
+	  for file in $(DIST_ARCHIVES); do				\
+	    for p in ./ $(release_archive_dir)/; do			\
+	      test -e $$p$$file || continue;				\
+	      test -w $$p$$file						\
+		|| { echo ERROR: $$p$$file is not writable; fail=1; };	\
+	    done;							\
 	  done;								\
 	  test "$$fail" && exit 1 || : ;				\
+	else :;								\
 	fi
 
 v_etc_file = $(gnulib_dir)/lib/version-etc.c