From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 21 Sep 2010 00:57:15 +0000 (+0700)
Subject: maint: edit-readme-alpha shouldn't try to re-edit during dist.
X-Git-Tag: v2.4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=850f41781e1c5e98b71457d1375231b1fa581325;p=thirdparty%2Flibtool.git

maint: edit-readme-alpha shouldn't try to re-edit during dist.

* libltdl/config/edit-readme-alpha: If README is non-writable
assume that it is being run from distcheck, and bail out with
a warning (to help diagnose cases where the heuristic is not
correct).  However, if README has already been edited to the
alpha text, quietly skip without an error message.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/ChangeLog b/ChangeLog
index ceb193cd4..4934ce585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21  Gary V. Vaughan  <gary@gnu.org>
+
+	maint: edit-readme-alpha shouldn't try to re-edit during dist.
+	* libltdl/config/edit-readme-alpha: If README is non-writable
+	assume that it is being run from distcheck, and skip the edit
+	with a warning (to help diagnose cases where the heuristic is
+	not correct).  However, if README has already been edited to
+	the alpha text, quietly skip without an error message.
+
 2010-09-20  Eric Blake  <eblake@redhat.com>
 
 	maint: drop autobuild requirement
diff --git a/libltdl/config/edit-readme-alpha b/libltdl/config/edit-readme-alpha
index 6070a3197..ee6ca6b97 100755
--- a/libltdl/config/edit-readme-alpha
+++ b/libltdl/config/edit-readme-alpha
@@ -55,10 +55,23 @@ func_fatal_error ()
 
 
 for file in "$@"; do
+  # Assume that read-only README indicates that we are running inside
+  # the latter part of a `make distcheck'.
+  test -w $file || {
+    echo "$progname: not editing non-writeable \`$file' (distcheck?)" >&2
+    continue
+  }
+
   # Make sure the paragraph we are matching has not been edited since
   # this script was written.
-  matched=`sed -n -e '/^This is GNU Libtool,/,/^interface.$/p' $file \
-      |wc -l |sed 's|^ *||'`
+  matched=`sed -n -e '/^This is GNU Libtool,/,/^interface\.$/p' $file \
+           |wc -l |sed 's|^ *||'`
+
+  # Unless, of course, it was edited by this script already.
+  test 3 = "$matched" \
+      || matched=`sed -n -e '/^This is an alpha testing release/,/behind a consistent, portable interface\.$/p' $file \
+                  |wc -l |sed 's|^ *||'`
+
   test 3 = "$matched" \
       || func_fatal_error "$file format has changed, please fix \`$0'"