diff options
| author | DJ Delorie <dj@redhat.com> | 2003-01-09 14:39:43 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2003-01-09 14:39:43 +0000 |
| commit | 27a39a5f0a50d010917b6a769d19ebd02daccfd6 (patch) | |
| tree | b2e75917f0bbb6ca8243c3759d339e2f9fa40c43 | |
| parent | 32d95f29bfe5f04c7a1a41a22928f83b6abe2a6c (diff) | |
| download | binutils-gdb-27a39a5f0a50d010917b6a769d19ebd02daccfd6.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 3 |
2 files changed, 10 insertions, 0 deletions
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 <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 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) |