From: Gary V. Vaughan <gary@gnu.org>
Date: Sat, 26 Feb 2005 23:53:17 +0000 (+0000)
Subject: * libltdl/Makefile.am (install-data-local):  cd to $(srcdir) before
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c814584c3b6c63373716469e895b17eb963cda;p=thirdparty%2Flibtool.git

* 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 de6e0207f..d892cb40d 100644
--- 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 7707c7908..0a483ec8b 100644
--- 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 db3446ae0..5b6415584 100644
--- 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 -; )