changeset 9859:a5fa8d721746

bootstrap: remove dangling *.[ch] symlinks from lib * build-aux/bootstrap [dangling symlink removal]: Move find's -depth option to precede all others, to avoid a warning. Remove *.[ch] files too, and from "$source_base" (usually lib/).
author Jim Meyering <meyering@redhat.com>
date Wed, 02 Apr 2008 08:32:17 +0200
parents 21157f1c35b7
children 6c7dda791c34
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 03 00:07:16 2008 +0200
+++ b/ChangeLog	Wed Apr 02 08:32:17 2008 +0200
@@ -1,3 +1,10 @@
+2008-04-03  Jim Meyering  <meyering@redhat.com>
+
+	bootstrap: remove dangling *.[ch] symlinks from lib
+	* build-aux/bootstrap [dangling symlink removal]: Move find's
+	-depth option to precede all others, to avoid a warning.
+	Remove *.[ch] files too, and from "$source_base" (usually lib/).
+
 2008-04-02  Bruno Haible  <bruno@clisp.org>
 
 	Avoid some warnings from "gcc -Wshadow".
--- a/build-aux/bootstrap	Thu Apr 03 00:07:16 2008 +0200
+++ b/build-aux/bootstrap	Wed Apr 02 08:32:17 2008 +0200
@@ -548,15 +548,17 @@
   done
 fi
 
-# Remove any dangling symlink matching "*.m4" in the gnulib-populated
-# $m4_base directory, since such a file would cause aclocal to fail.
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual
 # portability constraints of this script, that may seem a very demanding
 # requirement, but it should be ok.  Ignore any failure, which is fine,
 # since this is only a convenience to help developers avoid the relatively
 # unusual case in which a symlinked-to .m4 file is git-removed from gnulib
 # between successive runs of this script.
-find "$m4_base" -name '*.m4' -depth -type l -xtype l -delete > /dev/null 2>&1
+find "$m4_base" "$source_base" \
+  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+  -type l -xtype l -delete > /dev/null 2>&1
 
 # Reconfigure, getting other files.