diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-01-28 01:44:58 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2003-01-28 01:44:58 +0000 |
| commit | dbf45a01474176c88dd76e2cb9a9d9b411d18b98 (patch) | |
| tree | fc7b94127a33be82326d8e8226d907cd571ca282 /libjava/configure.in | |
| parent | 233888d3e0f887f850d13550b6426d40bb0ea2d1 (diff) | |
| download | gcc-dbf45a01474176c88dd76e2cb9a9d9b411d18b98.zip gcc-dbf45a01474176c88dd76e2cb9a9d9b411d18b98.tar.gz gcc-dbf45a01474176c88dd76e2cb9a9d9b411d18b98.tar.bz2 | |
configure.in (toolexecdir, [...]): Set and AC_SUBST.
* configure.in (toolexecdir, toolexecmainlibdir, toolexeclibdir):
Set and AC_SUBST. Remove USE_LIBDIR conditional.
* Makefile.am (toolexecdir, toolexeclibdir): Don't override.
(toolexecmainlib_DATA): Renamed from toolexeclib_DATA.
* Makefile.in, configure: Rebuilt.
From-SVN: r61931
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libjava/configure.in b/libjava/configure.in index 5592400..d3cdb3d 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -789,10 +789,22 @@ AC_SUBST(EXCEPTIONSPEC) AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AC_SUBST(GCC_UNWIND_INCLUDE) +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexecmainlibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexecmainlibdir='$(libdir)' +fi +toolexeclibdir=$toolexecmainlibdir/`$CC -print-multi-os-directory` +AC_SUBST(toolexecdir) +AC_SUBST(toolexecmainlibdir) +AC_SUBST(toolexeclibdir) + # Determine gcj version number. changequote(<<,>>) gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` |