From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 27 Feb 2007 21:59:33 +0000 (+0000)
Subject: * libltdl/Makefile.inc: Fix the file description, so that it
X-Git-Tag: release-2-1b~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8b793325e81b1e0e98e7cd8a229dc924ed9d3dc;p=thirdparty%2Flibtool.git

* 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 2669329a6..28bce6172 100644
--- 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 743bbb13e..364e7eee9 100644
--- 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 8eb3e8d1f..7b6500dd6 100644
--- 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