From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 2 May 2005 12:52:07 +0000 (+0000)
Subject: * libltdl/Makefile.am (local-install-files): Rename back from
X-Git-Tag: release-1-5-18~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a696cf8871465631f9cfbbe0625c9cd37932408;p=thirdparty%2Flibtool.git

* libltdl/Makefile.am (local-install-files): Rename back from
install-data-local.
* Makefile.am (install-data-hook):  Readd call to local-install-files.
* NEWS: Updated.
Fixes libltdl install regression introduced in 1.5.16.
---

diff --git a/Makefile.am b/Makefile.am
index 9dc35a8d7..e4c8e6d86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,6 +72,7 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
 
 # Create and install libltdl
 install-data-hook:
+	cd libltdl && $(MAKE) local-install-files
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
 	chmod +x $(DESTDIR)$(pkgdatadir)/install-sh
diff --git a/NEWS b/NEWS
index 7b4f499dc..be97cd861 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.5.17a: 2005-??-??; CVS version 1.5.17a, Libtool team:
+* Fix 1.5.16 regression not to install libtldl files from
+  `libtoolize --ltdl'ed software packages.
 * Bug Fixes.
 
 New in 1.5.16: 2005-04-24; CVS version 1.5.15a, Libtool team:
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 49d890225..30f61a694 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -42,7 +42,7 @@ ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
 
 ## To avoid spurious reconfiguration when the user installs these files
 ## with libtoolize, we have to preserve their timestamps carefully:
-install-data-local:
+local-install-files: $(ltdldatafiles)
 	-rm -rf $(DESTDIR)$(ltdldatadir)
 	$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
 	( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \