[backport fragment of redhat/gcc-4_7-branch r182541,
 drop -${libgcj_soversion} suffix from libgcj install path,
 it's redundant and breaks the rpm .spec file, Red Hat's
 gcc branches have carried this change for ages <mikpe@it.uu.se>]

--- gcc-4.7.2/libjava/classpath/configure.ac.~1~	2011-01-31 06:34:09.000000000 +0100
+++ gcc-4.7.2/libjava/classpath/configure.ac	2012-12-22 19:35:50.000000000 +0100
@@ -322,14 +322,14 @@ CLASSPATH_TOOLEXECLIBDIR
 dnl -----------------------------------------------------------
 dnl Sets the native libraries installation dir
 dnl -----------------------------------------------------------
-dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}-${libgcj_soversion}
+dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}
 AC_ARG_WITH([native-libdir],
 	    [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
 	    [
 	     nativeexeclibdir=${withval}
 	    ],
 	    [
-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version`
+	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
 	    ])
 
 AC_SUBST(nativeexeclibdir)
--- gcc-4.7.2/libjava/classpath/configure.~1~	2011-11-29 21:12:00.000000000 +0100
+++ gcc-4.7.2/libjava/classpath/configure	2012-12-22 19:35:50.000000000 +0100
@@ -5536,7 +5536,7 @@ if test "${with_native_libdir+set}" = se
 
 else
 
-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version`
+	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
 
 fi
 
--- gcc-4.7.2/libjava/configure.ac.~1~	2012-05-21 20:14:01.000000000 +0200
+++ gcc-4.7.2/libjava/configure.ac	2012-12-22 19:36:16.000000000 +0100
@@ -1613,7 +1613,7 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERS
 
 # Determine where the standard .db file and GNU Classpath JNI
 # libraries are found.
-gcjsubdir=gcj-$gcjversion-$libgcj_soversion
+gcjsubdir=gcj-$gcjversion
 multi_os_directory=`$CC -print-multi-os-directory`
 case $multi_os_directory in
   .)
--- gcc-4.7.2/libjava/configure.~1~	2012-09-20 09:23:55.000000000 +0200
+++ gcc-4.7.2/libjava/configure	2012-12-22 19:36:31.000000000 +0100
@@ -23834,7 +23834,7 @@ _ACEOF
 
 # Determine where the standard .db file and GNU Classpath JNI
 # libraries are found.
-gcjsubdir=gcj-$gcjversion-$libgcj_soversion
+gcjsubdir=gcj-$gcjversion
 multi_os_directory=`$CC -print-multi-os-directory`
 case $multi_os_directory in
   .)