merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7280aa03747f7732781fe580c13cbd276c12feed..3b236b01b397e3472c684faff3031daa8f45d1aa 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
+
+       * Makefile.in (install_to_libdir, install_to_tooldir): Add a
+       mkinstalldirs command.
+
 2002-12-04  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX):

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index cdf14a4311b11589ab2d431f996fe63086a81f82..1af4c32277e5c7dd5e49238b4556464f5f46e816 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -84,6 +84,7 @@ FLAGS_TO_PASS = \
        "AR_FLAGS=$(AR_FLAGS)" \
        "CC=$(CC)" \
        "CFLAGS=$(CFLAGS)" \
+       "DESTDIR=$(DESTDIR)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "EXTRA_OFILES=$(EXTRA_OFILES)" \
        "HDEFINES=$(HDEFINES)" \
@@ -261,6 +262,7 @@ INSTALL_DEST = @INSTALL_DEST@
 install: install_to_$(INSTALL_DEST) install-subdir
 
 install_to_libdir: all
+       ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
        $(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)
@@ -277,6 +279,7 @@ install_to_libdir: all
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 install_to_tooldir: all
+       ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)
        $(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)