diff options
| -rw-r--r-- | libffi/ChangeLog | 7 | ||||
| -rw-r--r-- | libffi/ChangeLog.libgcj | 7 | ||||
| -rw-r--r-- | libffi/Makefile.am | 9 | ||||
| -rw-r--r-- | libffi/configure.in | 12 |
4 files changed, 25 insertions, 10 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 9327258a606..ebefffa6f5f 100644 --- 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 4c5be6d3fd0..751b31b3b2f 100644 --- 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 c5636bbddca..33c365c2985 100644 --- 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 3dccbeb85b3..8fcf2f61422 100644 --- 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" |