From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 9 Jun 2006 15:13:45 +0000 (+0000)
Subject: * Makefile.am (install-data-local): Do not use $(INSTALL_DATA)
X-Git-Tag: release-2-1b~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c17fac0153cf3dd1262a895c1f0f5f4e58c33e5c;p=thirdparty%2Flibtool.git

* Makefile.am (install-data-local): Do not use $(INSTALL_DATA)
from another directory: it may use a relative path to
`install-sh'.
Bug report by Dan Lacher <Daniel.Lacher@Sun.COM>.
---

diff --git a/ChangeLog b/ChangeLog
index 803a27bfc..91e12268e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (install-data-local): Do not use $(INSTALL_DATA)
+	from another directory: it may use a relative path to
+	`install-sh'.
+	Bug report by Dan Lacher <Daniel.Lacher@Sun.COM>.
+
 2006-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/config/ltmain.m4sh (func_mode_link): Honor `-threads',
diff --git a/Makefile.am b/Makefile.am
index a13dbc4a3..5efcb97b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -325,28 +325,25 @@ install-data-local: libltdl/Makefile.in
 ## with libtoolize, we have to install them in the correct order:
 ## First, put a copy of the libtool m4 macros in the aclocal dir
 	$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
-	@cd $(srcdir)/$(m4dir) && \
-	list='$(aclocalfiles)'; for p in $$list; do \
+	@list='$(aclocalfiles)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||'`; \
-	  echo " $(INSTALL_DATA) '$$f' '$(DESTDIR)$(aclocaldir)/$$f'"; \
-	  $(INSTALL_DATA) "$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
+	  echo " $(INSTALL_DATA) '$(srcdir)/$(m4dir)/$$f' '$(DESTDIR)$(aclocaldir)/$$f'"; \
+	  $(INSTALL_DATA) "$(srcdir)/$(m4dir)/$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
 	done
 ## install the helper scripts
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/config
-	@cd $(srcdir)/libltdl && \
-	list='$(auxfiles)' && for p in $$list; do \
-	  echo " $(INSTALL_SCRIPT) '$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
-	  $(INSTALL_SCRIPT) "$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+	@list='$(auxfiles)' && for p in $$list; do \
+	  echo " $(INSTALL_SCRIPT) '$(srcdir)/libltdl/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/libltdl/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
 	done
 ## install the libltdl files
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/libltdl
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/libltdl/libltdl
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/libltdl/loaders
-	@cd $(srcdir) && \
-	list='$(ltdldatafiles)' && for p in $$list; do \
-	  echo " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
-	  $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+	@list='$(ltdldatafiles)' && for p in $$list; do \
+	  echo " $(INSTALL_DATA) '$(srcdir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
+	  $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
 	done
 	-chmod a+x $(DESTDIR)$(pkgdatadir)/libltdl/configure