diff options
| author | DJ Delorie <dj@delorie.com> | 2002-06-22 13:31:20 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2002-06-22 13:31:20 +0000 |
| commit | 15a664474a7ec04f8b6aa866715ac9b91bb23ff4 (patch) | |
| tree | aa8ba1efb03c6eeec682493e3e7786578f37cd7e | |
| parent | 6ef82c8c536fa6166261e74d410a311f2fe7d86d (diff) | |
| download | gdb-15a664474a7ec04f8b6aa866715ac9b91bb23ff4.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 06cb89f4b0e..7d1067459cf 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2002-06-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.in (install_to_libdir): Add $(DESTDIR). + (install_to_tooldir): Likewise. + 2002-06-17 Douglas Rupp <rupp@gnat.com> * lbasename.c: Add 2002 to copyright. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 3dccfada3d7..60189725e16 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -256,25 +256,25 @@ INSTALL_DEST = @INSTALL_DEST@ install: install_to_$(INSTALL_DEST) install-subdir install_to_libdir: all - $(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n - ( cd $(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(libdir)$(MULTISUBDIR)/$(TARGETLIB) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n + ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) + mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB) if test -n "${target_header_dir}"; then \ case "${target_header_dir}" in \ /*) thd=${target_header_dir};; \ *) thd=${includedir}${MULTISUBDIR}/${target_header_dir};; \ esac; \ - ${mkinstalldirs} $${thd}; \ + ${mkinstalldirs} $(DESTDIR)$${thd}; \ for h in ${INSTALLED_HEADERS}; do \ - ${INSTALL_DATA} $$h $${thd}; \ + ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ done; \ fi @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install install_to_tooldir: all - $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n - ( cd $(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n + ( cd $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) + mv -f $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # needed-list is used by libstdc++. NEEDED is the list of functions |