Evolinx/gcc
Evolinx/gcc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Alexandre Oliva 2003-01-28 01:48:33 +00:00 committed by Alexandre Oliva
parent dbf45a0147
commit 0e292c0153
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libffi/ChangeLog
View File

@ -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.

7
libffi/ChangeLog.libgcj
View File

@ -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.

9
libffi/Makefile.am
View File

@ -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

12
libffi/configure.in
View File

@ -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"