CVSROOT: /cvsroot/libtool Module name: libtool Changes by: Ralf Wildenhues <rwild> 06/06/09 15:13:45
Modified files: . : ChangeLog Makefile.am Log message: * 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 <[EMAIL PROTECTED]>. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/libtool/ChangeLog?cvsroot=libtool&r1=1.2306&r2=1.2307 http://cvs.savannah.gnu.org/viewcvs/libtool/Makefile.am?cvsroot=libtool&r1=1.194&r2=1.195 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/libtool/libtool/ChangeLog,v retrieving revision 1.2306 retrieving revision 1.2307 diff -u -b -r1.2306 -r1.2307 --- ChangeLog 8 Jun 2006 16:54:44 -0000 1.2306 +++ ChangeLog 9 Jun 2006 15:13:45 -0000 1.2307 @@ -1,3 +1,10 @@ +2006-06-09 Ralf Wildenhues <[EMAIL PROTECTED]> + + * 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 <[EMAIL PROTECTED]>. + 2006-06-08 Ralf Wildenhues <[EMAIL PROTECTED]> * libltdl/config/ltmain.m4sh (func_mode_link): Honor `-threads', @@ -421,6 +428,6 @@ Continued in ChangeLog.2005 - $Revision: 1.2306 $ $Date: 2006/06/08 16:54:44 $ + $Revision: 1.2307 $ $Date: 2006/06/09 15:13:45 $ vim:tw=72 Index: Makefile.am =================================================================== RCS file: /cvsroot/libtool/libtool/Makefile.am,v retrieving revision 1.194 retrieving revision 1.195 diff -u -b -r1.194 -r1.195 --- Makefile.am 15 May 2006 16:14:24 -0000 1.194 +++ Makefile.am 9 Jun 2006 15:13:45 -0000 1.195 @@ -325,28 +325,25 @@ ## 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 _______________________________________________ Libtool-commit mailing list Libtool-commit@gnu.org http://lists.gnu.org/mailman/listinfo/libtool-commit