* libltdl/Makefile.inc: Fix the file description, so that it

matches recursive and nonrecursive libltdl setup.
* Makefile.am ($(srcdir)/libltdl/Makefile.am): Do not depend
upon the exact text of the copyright header, just copy until
the marker line.  Remove the marker lines in the output, and
adjust the description for subpackage setup.

diff --git a/ChangeLog b/ChangeLog
index 2669329a6f033202d2186d57f80c61b8639528bb..28bce617277a1047a55d06df0020958ba8a68e42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/Makefile.inc: Fix the file description, so that it
+       matches recursive and nonrecursive libltdl setup.
+       * Makefile.am ($(srcdir)/libltdl/Makefile.am): Do not depend
+       upon the exact text of the copyright header, just copy until
+       the marker line.  Remove the marker lines in the output, and
+       adjust the description for subpackage setup.
+
 2007-02-26  Gary V. Vaughan  <gary@gnu.org>
 
        * Makefile.am ($(srcdir)/libltdl/Makefile.am): Fix regexp typo.

diff --git a/Makefile.am b/Makefile.am
index 743bbb13e8f0a8382adfb6b0124ba84a20db7951..364e7eee90a592fe0070b0a41ba4f7164f221f3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,7 +201,7 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
        cd $(srcdir); \
        in=libltdl/Makefile.inc; out=libltdl/Makefile.am; \
        rm -f $$out; \
-       $(SED) -n '/^.. Makefile.am -- /,/^.. MA 02110-1301, USA./p' $$in > $$out; \
+       ( $(SED) -n '1,/^.. DO NOT REMOVE THIS LINE -- /p' $$in; \
        { echo 'ACLOCAL_AMFLAGS = -I m4'; \
          echo 'AUTOMAKE_OPTIONS = foreign'; \
          echo 'AM_CPPFLAGS ='; \
@@ -214,10 +214,13 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
          echo 'EXTRA_DIST ='; \
          echo 'CLEANFILES ='; \
          echo 'MOSTLYCLEANFILES ='; \
-       } >> $$out; \
+       }; \
        $(SED) -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' $$in | \
        $(SED) -e 's,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,' \
-              -e 's,\$$(libltdl_,$$(,' >> $$out;
+              -e 's,\$$(libltdl_,$$(,' \
+       ) | \
+       $(SED) -e '/^.. DO NOT REMOVE THIS LINE -- /d' \
+              -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with automake to produce Makefile.in,' > $$out;
        chmod a-w $(srcdir)/libltdl/Makefile.am
 
 

diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index 8eb3e8d1f55cc0564315669ac204291733b86887..7b6500dd63e6b6cecfccaa8f0d524089bf8f325a 100644 (file)
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -1,6 +1,6 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+## Makefile.inc -- includable Makefile.am snippet
 ##
-## Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by