From c0b678994b1504e632eb5044defd5286ff22a633 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 9 Dec 2009 17:34:02 +0100 Subject: [PATCH] link-warning: Allow extra lines at the top of build-aux/link-warning.h. --- ChangeLog | 7 +++++++ modules/link-warning | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4009854da..d5997c719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-12-09 Jim Meyering + Bruno Haible + + 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 * lib/mgetgroups.c (mgetgroups): Don't remove duplicates if there is at diff --git a/modules/link-warning b/modules/link-warning index 33085b768..970ad5536 100644 --- 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 -- 2.11.0