diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-28 01:44:58 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-28 01:44:58 +0000 |
| commit | 2c90f01760bfadb7ac269e29da533db0aa93fe23 (patch) | |
| tree | fc7b94127a33be82326d8e8226d907cd571ca282 /libjava/configure.in | |
| parent | 0a5184b0a66ddb1f876ef992c8bd1befd7b3e754 (diff) | |
| download | ppe42-gcc-2c90f01760bfadb7ac269e29da533db0aa93fe23.tar.gz ppe42-gcc-2c90f01760bfadb7ac269e29da533db0aa93fe23.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61931 138bc75d-0d04-0410-961f-82ee72b054a4
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 5592400cf58..d3cdb3df9a3 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'` |
