PR other/16513

	* Makefile.in: Install library under $(MULTIOSDIR), not $(MULTISUBDIR).
	Install headers in multilib independent location.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 74e49a904fe547a4a9763341c9c27182b4d160ae..34e01a8d07a9090fe91b4d9e54e4e3233e7c9a59 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+            Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/16513
+       * Makefile.in: Install library under $(MULTIOSDIR), not $(MULTISUBDIR).
+       Install headers in multilib independent location.
+
 2007-02-26  DJ Delorie  <dj@redhat.com>
 
        * configure.ac: add djgpp-specific results, so we don't have to

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 6e02403f46f9d3fbf8ddb57b8fc2124697b40698..570d2e8ba15cd748c3fa5911194e5dc68e77e130 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -336,15 +336,20 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
 INSTALL_DEST = @INSTALL_DEST@
 install: install_to_$(INSTALL_DEST) install-subdir
 
+# This is tricky.  Even though CC in the Makefile contains
+# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+# default multilib, so we have to take LIBCFLAGS into account as well,
+# since it will be passed the multilib flags.
+MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-       ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
-       $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
-       ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-       mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+       ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
+       $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
+       ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+       mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
        if test -n "${target_header_dir}"; then \
          case "${target_header_dir}" in \
            /*)    thd=${target_header_dir};; \
-           *)     thd=${includedir}${MULTISUBDIR}/${target_header_dir};; \
+           *)     thd=${includedir}/${target_header_dir};; \
          esac; \
          ${mkinstalldirs} $(DESTDIR)$${thd}; \
          for h in ${INSTALLED_HEADERS}; do \
@@ -353,11 +358,6 @@ install_to_libdir: all
        fi
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
-# This is tricky.  Even though CC in the Makefile contains
-# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
-# default multilib, so we have to take LIBCFLAGS into account as well,
-# since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
 install_to_tooldir: all
        ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
        $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n