diff options
author | Mark Mitchell <mark@codesourcery.com> | 2013-05-22 21:25:59 +0000 |
---|---|---|
committer | Sandra Loosemore <sandra@gcc.gnu.org> | 2013-05-22 17:25:59 -0400 |
commit | 4623df015adf47d07e271ab7364016eca01a9e29 (patch) | |
tree | 1790751c721165e380b6e908472c44e6a730821b /libjava/configure | |
parent | 49dcafd4ec15f13c2be5a3168cbc3d30cd67d650 (diff) | |
download | gcc-4623df015adf47d07e271ab7364016eca01a9e29.zip gcc-4623df015adf47d07e271ab7364016eca01a9e29.tar.gz gcc-4623df015adf47d07e271ab7364016eca01a9e29.tar.bz2 |
configure.ac (dbexecdir): Base on $(toolexeclibdir), not $(libdir).
2013-05-22 Mark Mitchell <mark@codesourcery.com>
Sandra Loosemore <sandra@codesourcery.com>
libjava/
* configure.ac (dbexecdir): Base on $(toolexeclibdir), not
$(libdir).
* Makefile.am (pkgconfigdir): Likewise.
* configure: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
libjava/classpath/
* configure.ac: Define host_noncanonical and target_noncanonical.
Support --enable-version-specific-runtime-libs.
* m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): Match libjava
definition of toolexeclibdir.
* configure: Regenerated.
* Makefile.in: Regenerated.
* doc/api/Makefile.in: Regenerated.
* doc/Makefile.in: Regenerated.
* examples/Makefile.in: Regenerated.
* external/jsr166/Makefile.in: Regenerated.
* external/Makefile.in: Regenerated.
* external/relaxngDatatype/Makefile.in: Regenerated.
* external/sax/Makefile.in: Regenerated.
* external/w3c_dom/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* lib/Makefile.in: Regenerated.
* native/fdlibm/Makefile.in: Regenerated.
* native/jawt/Makefile.in: Regenerated.
* native/jni/Makefile.in: Regenerated.
* native/jni/gconf-peer/Makefile.in: Regenerated.
* native/jni/gstreamer-peer/Makefile.in: Regenerated.
* native/jni/gtk-peer/Makefile.in: Regenerated.
* native/jni/java-io/Makefile.in: Regenerated.
* native/jni/java-lang/Makefile.in: Regenerated.
* native/jni/java-math/Makefile.in: Regenerated.
* native/jni/java-net/Makefile.in: Regenerated.
* native/jni/java-nio/Makefile.in: Regenerated.
* native/jni/java-util/Makefile.in: Regenerated.
* native/jni/Makefile.in: Regenerated.
* native/jni/midi-alsa/Makefile.in: Regenerated.
* native/jni/midi-dssi/Makefile.in: Regenerated.
* native/jni/native-lib/Makefile.in: Regenerated.
* native/jni/qt-peer/Makefile.in: Regenerated.
* native/jni/xmlj/Makefile.in: Regenerated.
* native/Makefile.in: Regenerated.
* native/plugin/Makefile.in: Regenerated.
* resource/Makefile.in: Regenerated.
* scripts/Makefile.in: Regenerated.
* tools/Makefile.in: Regenerated.
Co-Authored-By: Sandra Loosemore <sandra@codesourcery.com>
From-SVN: r199221
Diffstat (limited to 'libjava/configure')
-rwxr-xr-x | libjava/configure | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure index 44acaeb..07604ae 100755 --- a/libjava/configure +++ b/libjava/configure @@ -3206,7 +3206,7 @@ esac -I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \ -I\$(top_srcdir)/../libstdc++-v3/libsupc++" LIBSTDCXX_RAW_CXX_LDFLAGS="\ - -I\$(top_builddir)/../libstdc++-v3/src/libstdc++.la" + \$(top_builddir)/../libstdc++-v3/src/libstdc++.la" @@ -23842,10 +23842,10 @@ gcjsubdir=gcj-$gcjversion-$libgcj_soversion multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) - dbexecdir='$(libdir)/'$gcjsubdir # Avoid /. + dbexecdir='$(toolexeclibdir)/'$gcjsubdir # Avoid /. ;; *) - dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir + dbexecdir='$(toolexeclibdir)/'$multi_os_directory/$gcjsubdir ;; esac |