From 6bc263111ba64533827ccf2cdb17882cac59743f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 9 Jan 2003 14:39:43 +0000 Subject: merge from gcc --- libiberty/ChangeLog | 7 +++++++ libiberty/Makefile.in | 3 +++ 2 files changed, 10 insertions(+) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7280aa03747..3b236b01b39 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2003-01-09 Christian Cornelssen + + * 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 * make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX): diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index cdf14a4311b..1af4c32277e 100644 --- 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) -- cgit v1.2.1