Index: gcc-4.3.4/libjava/Makefile.am
===================================================================
Index: gcc-4.3.4/libjava/Makefile.in
===================================================================
Index: gcc-4.3.4/libjava/configure
===================================================================
--- gcc-4.3.4.orig/libjava/configure
+++ gcc-4.3.4/libjava/configure
@@ -26229,15 +26229,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='$(libdir)/'$gcjsubdir # Avoid /.
-   ;;
-  *)
-   dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
-   ;;
-esac
+dbexecdir='$(toolexeclibdir)'/$gcjsubdir
 
 
 
Index: gcc-4.3.4/libjava/configure.ac
===================================================================
--- gcc-4.3.4.orig/libjava/configure.ac
+++ gcc-4.3.4/libjava/configure.ac
@@ -1406,15 +1406,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='$(libdir)/'$gcjsubdir # Avoid /.
-   ;;
-  *)
-   dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
-   ;;
-esac
+dbexecdir='$(toolexeclibdir)'/$gcjsubdir
 AC_SUBST(dbexecdir)
 AC_SUBST(gcjsubdir)