diff options
| author | sandra <sandra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-22 21:25:59 +0000 |
|---|---|---|
| committer | sandra <sandra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-22 21:25:59 +0000 |
| commit | 610c4b2132181eb6a3ab2175c17c62e973527adc (patch) | |
| tree | 1790751c721165e380b6e908472c44e6a730821b /libjava/configure.ac | |
| parent | 47ab8c1041ceaa68eb20d592fab3d884e06bfb13 (diff) | |
| download | ppe42-gcc-610c4b2132181eb6a3ab2175c17c62e973527adc.tar.gz ppe42-gcc-610c4b2132181eb6a3ab2175c17c62e973527adc.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199221 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index ba6b3632b92..eb734b1768d 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1599,10 +1599,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 AC_SUBST(dbexecdir) |
