configure.in (toolexecdir, [...]): Set and AC_SUBST.

* configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.
Remove USE_LIBDIR conditional.
* Makefile.am (toolexecdir, toolexeclibdir): Don't override.
* Makefile.in, configure: Rebuilt.

[[Split portion of a mixed commit.]]

From-SVN: r61935.2

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 9327258a606ddc56ca9ff7570a8ec26785c74d3e..ebefffa6f5f2105a7c0d8d52ec352939d3e8770a 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.
+       Remove USE_LIBDIR conditional.
+       * Makefile.am (toolexecdir, toolexeclibdir): Don't override.
+       * Makefile.in, configure: Rebuilt.
+
 2003-01027  David Edelsohn  <edelsohn@gnu.org>
 
        * Makefile.am (TARGET_SRC_POWERPC_AIX): Fix typo.

diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj
index 4c5be6d3fd09d91a4db072ff11d4d751fa7546db..751b31b3b2f121362f97d97ed1401bdcaeb699e3 100644 (file)
--- a/libffi/ChangeLog.libgcj
+++ b/libffi/ChangeLog.libgcj
@@ -1,3 +1,10 @@
+2002-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.
+       Remove USE_LIBDIR conditional.
+       * Makefile.am (toolexecdir, toolexeclibdir): Don't override.
+       * Makefile.in, configure: Rebuilt.
+
 Mon Aug  9 18:33:38 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * include/Makefile.in: Rebuilt.

diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index c5636bbddca312d3fb08498bd2d27a5a666eb11a..33c365c29850196cc17ed77b3bba93c194aac71c 100644 (file)
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -76,15 +76,6 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
-## Install a library built with a cross compiler in tooldir, not
-## libdir.
-if USE_LIBDIR
-toolexeclibdir = $(libdir)$(MULTISUBDIR)
-else
-toolexecdir = $(exec_prefix)/$(target_alias)
-toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
-endif
-
 toolexeclib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la
 

diff --git a/libffi/configure.in b/libffi/configure.in
index 3dccbeb85b30a1b0e2747049b421d67a2d5b76fe..8fcf2f61422a3eb09a5f5258f51a7a0fa9c6cb47 100644 (file)
--- a/libffi/configure.in
+++ b/libffi/configure.in
@@ -164,7 +164,17 @@ AC_ARG_ENABLE(purify-safety,
     AC_DEFINE(USING_PURIFY)
   fi)
 
-AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+if test -n "$with_cross_host" &&
+   test x"$with_cross_host" != x"no"; then
+  toolexecdir='$(exec_prefix)/$(target_alias)'
+  toolexeclibdir='$(toolexecdir)/lib'
+else
+  toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  toolexeclibdir='$(libdir)'
+fi
+toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory`
+AC_SUBST(toolexecdir)
+AC_SUBST(toolexeclibdir)
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"