Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use /`$$CC -print-multi...

* Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use
/`$$CC -print-multi-os-directory`.

From-SVN: r61929

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9e7fc1df422bf9d803a4cdb0fea67d97df075178..411ec23a963e85cbc11fd3a99345eb263d016f54 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+       * Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use
+       /`$$CC -print-multi-os-directory`.
+
 2003-01-20  Josef Zlomek  <zlomekj@suse.cz>
 
        * hashtab.c (htab_expand): Fix allocation of new entries.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index a399d4edbe017895c5267a12a1adb85f2447e800..4efc16a49883548856f70a24d64dab30838561e1 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Makefile
-#   Copyright (C) 1990, 91-99, 2000, 2001
+#   Copyright (C) 1990, 91-99, 2000, 2001, 2003
 #   Free Software Foundation
 #
 # This file is part of the libiberty library.
@@ -243,9 +243,9 @@ install_to_libdir: all
        @$(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) $(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)
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
 # needed-list is used by libstdc++.  NEEDED is the list of functions