re PR java/60261 (Weird java install with --enable-version-specific-runtime-libs)

2014-02-20  Richard Biener  <rguenther@suse.de>

	PR libjava/60261
	* configure.ac (dbexecdir): Remove redundant multilib addition.
	* Makefile.am (gcc_version): Export.
	* configure: Regenerate.
	* Makefile.in: Likewise.

From-SVN: r207936

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d9b59aa5b217f4037661984caf565247c285f715..6ca70f54be5b686e901b8ffc2d49f14d950a8f2a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-18  Richard Biener  <rguenther@suse.de>
+
+       PR libjava/60261
+       * configure.ac (dbexecdir): Remove redundant multilib addition.
+       * Makefile.am (gcc_version): Export.
+       * configure: Regenerate.
+       * Makefile.in: Likewise.
+
 2014-01-02  Tobias Burnus  <burnus@net-b.de>
 
        * gnu/gcj/convert/Convert.java (version): Update copyright notice

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 5af58faa3af5745b7d0bcaa752c6fa8229028ca5..39b5199ff4e616ecd89af00b2c617b847b79390e 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+export gcc_version
 
 SUBDIRS = $(DIRLTDL) gcj include classpath
 if TESTSUBDIR

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 8ce97486b17b247d32e8fbeeb584ffffcde2486c..f0f635036eb4105150310f22f624ddd833000e5d 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -10581,6 +10581,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-libexecsubPROGRAMS uninstall-toolexeclibLTLIBRARIES \
        uninstall-toolexecmainlibDATA
 
+export gcc_version
 
 interpret.lo:  AM_CXXFLAGS += -fwrapv
 prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer

diff --git a/libjava/configure b/libjava/configure
index 55443608c0c5571c4ac7d49498402cd10dc0d793..6fb813f4bd6753d9c55463a3e9f45e44594030dd 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -24016,15 +24016,7 @@ _ACEOF
 # Determine where the standard .db file and GNU Classpath JNI
 # libraries are found.
 gcjsubdir=gcj-$gcjversion-$libgcj_soversion
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
-  .)
-   dbexecdir='$(toolexeclibdir)/'$gcjsubdir # Avoid /.
-   ;;
-  *)
-   dbexecdir='$(toolexeclibdir)/'$multi_os_directory/$gcjsubdir
-   ;;
-esac
+dbexecdir='$(toolexeclibdir)/'$gcjsubdir
 
 
 

diff --git a/libjava/configure.ac b/libjava/configure.ac
index eb734b1768ddaa266d08a23ebff8c79ba2eaf49a..d2f69a9dd43380bf7a79c218d95fb112e0a8fb86 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1596,15 +1596,7 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
 # Determine where the standard .db file and GNU Classpath JNI
 # libraries are found.
 gcjsubdir=gcj-$gcjversion-$libgcj_soversion
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
-  .)
-   dbexecdir='$(toolexeclibdir)/'$gcjsubdir # Avoid /.
-   ;;
-  *)
-   dbexecdir='$(toolexeclibdir)/'$multi_os_directory/$gcjsubdir
-   ;;
-esac
+dbexecdir='$(toolexeclibdir)/'$gcjsubdir
 AC_SUBST(dbexecdir)
 AC_SUBST(gcjsubdir)