* libltdl/Makefile.am (install-data-local): Don't forget about

$(DESTDIR).
* libltdl/loaders/Makefile.am (install-data-local): Ditto.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index 18c3b8bc6edb2860c872c98b0094ce8ddbcc960e..84d6b10b5fefdbc020ad41072cdf18024e95de57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-23  Gary V. Vaughan  <gary@gnu.org>
+
+       * libltdl/Makefile.am (install-data-local): Don't forget about
+       $(DESTDIR).
+       * libltdl/loaders/Makefile.am (install-data-local): Ditto.
+       * NEWS: Updated.
+
 2005-02-23  Gary V. Vaughan  <gary@gnu.org>
 
        Preserving the installed timestamps for libltdl sources from

diff --git a/NEWS b/NEWS
index a89178eb685abc3f67053fcc239e4d6ef192da9e..663533fc248ec92645a28392a0ecd6817003f2ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Support for Portland Group compiler on GNU/Linux.
 * Fix libltdl on static platforms.
+* Fix spurious reconfiguration of newly installed libltdl sources.
 * Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
 * `libtoolize --install' now also installs `install-sh'.
 * Support (mostly) for DragonFly BSD.

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index c51aeed1eda9da1206cde33e2cb56953131d7895..2d5b9e06aeeda1a1122304349a25e2bf9d93f583 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -80,9 +80,10 @@ ltdldatafiles                = COPYING.LIB Makefile.am README configure.ac \
 ## To avoid spurious reconfiguration when the user installs these files
 ## with libtoolize, we have to preserve their timestamps carefully:
 install-data-local:
-       $(mkinstalldirs) $(ltdldatadir)
+       -rm -rf $(DESTDIR)$(ltdldatadir)
+       $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
        $(AMTAR) cf - $(ltdldatafiles) \
-         | ( cd $(ltdldatadir) && $(AMTAR) xf -; )
+         | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
 
 ## Make sure these will be cleaned even when they're not built by default:
 CLEANFILES             = libltdl.la libltdlc.la libdlloader.la

diff --git a/libltdl/loaders/Makefile.am b/libltdl/loaders/Makefile.am
index 7b44e767e2059fc605bcdd0ecb13ba3f62b57626..8333cbeca728c0e255a827e2f183a72c3c4756ce 100644 (file)
--- a/libltdl/loaders/Makefile.am
+++ b/libltdl/loaders/Makefile.am
@@ -57,9 +57,10 @@ ltdldatafiles                = Makefile.am dld_link.c dlopen.c dyld.c \
 ## To avoid spurious reconfiguration when the user installs these files
 ## with libtoolize, we have to preserve their timestamps carefully:
 install-data-local:
-       $(mkinstalldirs) $(ltdldatadir)
+       -rm -rf $(DESTDIR)$(ltdldatadir)
+       $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
        $(AMTAR) cf - $(ltdldatafiles) \
-         | ( cd $(ltdldatadir) && $(AMTAR) xf -; )
+         | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
 
 ../libdlloader.la:
        cd ..; $(MAKE) $(AM_MAKEFLAGS) libdlloader.la