FYI: Small fix for 1.5.16 to turn off installation on default

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Fri, Apr 29, 2005 at 08:33:35AM CEST:
> * Andreas Schwab wrote on Thu, Apr 28, 2005 at 06:48:10PM CEST:
> > As a user of the libltdl library I surely don't want to install the
> > libltdl data files as part of my project.
> 
> You are both correct.  This is a regression from 1.5.14.  :-(

FYI: I have applied Andreas' patch, as below, to branch-1-5.
It restores the code to the version before, so I deemed it safer than
Dalibor's patch.  I changed the local-install-files target to also
depend on the files to be installed (which also matches 1.5.14 more
closely), and added a NEWS entry.

Regards,
Ralf

2005-05-02  Andreas Schwab  <address@hidden>

        * 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.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.69.2.14
diff -u -r1.69.2.14 Makefile.am
--- Makefile.am 24 Feb 2005 20:40:50 -0000      1.69.2.14
+++ Makefile.am 2 May 2005 12:44:21 -0000
@@ -72,6 +72,7 @@
 
 # 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
Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.109.2.31
diff -u -r1.109.2.31 NEWS
--- NEWS        25 Apr 2005 18:44:19 -0000      1.109.2.31
+++ NEWS        2 May 2005 12:44:21 -0000
@@ -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:
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.42.2.5
diff -u -r1.42.2.5 Makefile.am
--- libltdl/Makefile.am 10 Mar 2005 20:20:41 -0000      1.42.2.5
+++ libltdl/Makefile.am 2 May 2005 12:44:21 -0000
@@ -42,7 +42,7 @@
 
 ## 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); ) \