Makefile.in (mkinstalldirs): New variable.

* Makefile.in (mkinstalldirs): New variable.
(FLAGS_TO_PASS): Also pass DESTDIR.
(install_to_libdir, install_to_tooldir): Add $(mkinstalldirs)
command.  Prepend $(DESTDIR) to destination paths.
Cd to destination directory for post-install work.

From-SVN: r62012

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 411ec23a963e85cbc11fd3a99345eb263d016f54..7accc6805eba04e5dff32f26cd8eee7327d9942b 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.in (mkinstalldirs): New variable.
+       (FLAGS_TO_PASS): Also pass DESTDIR.
+       (install_to_libdir, install_to_tooldir): Add $(mkinstalldirs)
+       command.  Prepend $(DESTDIR) to destination paths.
+       Cd to destination directory for post-install work.
+
 2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 4efc16a49883548856f70a24d64dab30838561e1..c4248b0500c51890721f9e256d9113a7d75b4d90 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -48,6 +48,7 @@ MULTICLEAN = true
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs
 
 AR = @AR@
 AR_FLAGS = rc
@@ -78,6 +79,7 @@ FLAGS_TO_PASS = \
        "AR_FLAGS=$(AR_FLAGS)" \
        "CC=$(CC)" \
        "CFLAGS=$(CFLAGS)" \
+       "DESTDIR=$(DESTDIR)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "EXTRA_OFILES=$(EXTRA_OFILES)" \
        "HDEFINES=$(HDEFINES)" \
@@ -237,15 +239,19 @@ 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)
+       $(mkinstalldirs) $(DESTDIR)$(libdir)$(MULTISUBDIR)
+       $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
+       ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) && \
+         $(RANLIB) $(TARGETLIB)n && \
+         mv -f $(TARGETLIB)n $(TARGETLIB) )
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 install_to_tooldir: all
-       $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n
-       ( cd $(tooldir)/lib/`$$CC -print-multi-os-directory` ; $(RANLIB) $(TARGETLIB)n )
-       mv -f $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)
+       $(mkinstalldirs) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`
+       $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n
+       ( cd $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` && \
+         $(RANLIB) $(TARGETLIB)n && \
+         mv -f $(TARGETLIB)n $(TARGETLIB) )
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 # needed-list is used by libstdc++.  NEEDED is the list of functions