* libltdl/Makefile.am (install-data-local): cd to $(srcdir) before

tarring up the files for installation to $(DESTDIR)$(ltdldatadir).
Don't remove the destination directory, since that interacts badly
with the multi-Makefile installation.
* libltdl/loaders/Makefile.am (install-data-local): Ditto.

diff --git a/ChangeLog b/ChangeLog
index de6e0207f551af9bf2306e92b363a19512b16e12..d892cb40d25bb1cb79bcc54186720606bcd53564 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-26  Gary V. Vaughan  <gary@gnu.org>
+
+       * libltdl/Makefile.am (install-data-local):  cd to $(srcdir) before
+       tarring up the files for installation to $(DESTDIR)$(ltdldatadir).
+       Don't remove the destination directory, since that interacts badly
+       with the multi-Makefile installation.
+       * libltdl/loaders/Makefile.am (install-data-local): Ditto.
+
 2005-02-26  Gary V. Vaughan  <gary@gnu.org>
 
        I assume that it is okay to have undefined symbols in convenience

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 7707c7908613f5f8b995f4c0679bef720c9c7317..0a483ec8b2bdec224b4e473d7b11e8d8bede68fd 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -76,9 +76,8 @@ 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:
-       -rm -rf $(DESTDIR)$(ltdldatadir)
        $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
-       $(AMTAR) cf - $(ltdldatafiles) \
+       ( cd $(srcdir) && $(AMTAR) cf - $(ltdldatafiles); ) \
          | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
 
 ## Make sure these will be cleaned even when they're not built by default:

diff --git a/libltdl/loaders/Makefile.am b/libltdl/loaders/Makefile.am
index db3446ae0b3de74cbd11ba6515fa44b242dd44d0..5b64155848793bf5823dcc6b54b6a1c658503b6a 100644 (file)
--- a/libltdl/loaders/Makefile.am
+++ b/libltdl/loaders/Makefile.am
@@ -53,7 +53,6 @@ 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:
-       -rm -rf $(DESTDIR)$(ltdldatadir)
        $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
-       $(AMTAR) cf - $(ltdldatafiles) \
+       ( cd $(srcdir) && $(AMTAR) cf - $(ltdldatafiles) preopen.c; ) \
          | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )