link-warning: Allow extra lines at the top of build-aux/link-warning.h.

diff --git a/ChangeLog b/ChangeLog
index 4009854daac68a0b5cf6ee15e40f086cde72b638..d5997c719ad3521d92a4025779f3240c10bd3737 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-09  Jim Meyering  <meyering@redhat.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       link-warning: Allow extra lines at the top of build-aux/link-warning.h.
+       * modules/link-warning (Makefile.am): Make the comment-removing sed
+       command more robust in the face of bootstrap-prepended comment lines.
+
 2009-12-09  Bruno Haible  <bruno@clisp.org>
 
        * lib/mgetgroups.c (mgetgroups): Don't remove duplicates if there is at

diff --git a/modules/link-warning b/modules/link-warning
index 33085b768fc35810fb62e0e7a022f9725d9a05f0..970ad55362d40bd2aa3398561f66ddb8938e55a9 100644 (file)
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -10,9 +10,13 @@ configure.ac:
 
 Makefile.am:
 BUILT_SOURCES += link-warning.h
+# The link-warning.h that gets inserted into generated .h files is the same as
+# build-aux/link-warning.h, except that it has the copyright header cut off.
 link-warning.h: $(top_srcdir)/build-aux/link-warning.h
        $(AM_V_GEN)rm -f $@-t $@ && \
-       sed 1,17d < $(top_srcdir)/build-aux/link-warning.h > $@-t && \
+       cat $(top_srcdir)/build-aux/link-warning.h \
+         | sed -e '1,/www\.gnu\.org\/licenses/d' | sed -e '1d' \
+         > $@-t && \
        mv $@-t $@
 MOSTLYCLEANFILES += link-warning.h link-warning.h-t