[Bug java/60261] [4.9 Regression] Weird java install with --enable-version-specific-runtime-libs

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60261

--- Comment #4 from Richard Biener <rguenth at gcc dot gnu.org> ---
Hmm, it seems to me that

# 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

is simply "duplicate", toolexeclibdir is already properly containing the
multilib.  Thus,

Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac        (revision 207837)
+++ libjava/configure.ac        (working copy)
@@ -1596,15 +1596,7 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERS
 # 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)

for dbexecdir?  But that makes it not version-specific again - it lacks
the GCC version suffix?