|
 |
0046873 |
2006-07-20 Jakub Jelinek <jakub@redhat.com>
|
|
|
0046873 |
|
|
|
0046873 |
* configure.ac (toolexeclibdir, dbexecdir): Canonicalize /lib/../lib
|
|
|
0046873 |
to /lib.
|
|
|
0046873 |
* configure: Rebuilt.
|
|
|
0046873 |
|
|
|
0046873 |
--- libjava/configure.ac.jj 2006-07-20 14:01:02.000000000 +0200
|
|
|
0046873 |
+++ libjava/configure.ac 2006-07-20 16:36:31.000000000 +0200
|
|
|
0046873 |
@@ -1262,6 +1262,7 @@ case ${version_specific_libs} in
|
|
|
0046873 |
multi_os_directory=`$CC -print-multi-os-directory`
|
|
|
0046873 |
case $multi_os_directory in
|
|
|
0046873 |
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
|
|
|
0046873 |
+ ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;;
|
|
|
0046873 |
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
|
|
|
0046873 |
esac
|
|
|
0046873 |
;;
|
|
|
0046873 |
@@ -1278,6 +1279,10 @@ case $multi_os_directory in
|
|
|
0046873 |
dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
|
|
|
0046873 |
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
|
|
|
0046873 |
;;
|
|
|
0046873 |
+ ../lib*)
|
|
|
0046873 |
+ dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))'
|
|
|
0046873 |
+ ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
|
|
|
0046873 |
+ ;;
|
|
|
0046873 |
*)
|
|
|
0046873 |
dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
|
|
|
0046873 |
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
|
|
|
0046873 |
--- libjava/configure.jj 2006-07-20 14:01:02.000000000 +0200
|
|
|
0046873 |
+++ libjava/configure 2006-07-20 16:45:24.000000000 +0200
|
|
|
0046873 |
@@ -14863,6 +14864,7 @@ case ${version_specific_libs} in
|
|
|
0046873 |
multi_os_directory=`$CC -print-multi-os-directory`
|
|
|
0046873 |
case $multi_os_directory in
|
|
|
0046873 |
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
|
|
|
0046873 |
+ ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;;
|
|
|
0046873 |
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
|
|
|
0046873 |
esac
|
|
|
0046873 |
;;
|
|
|
0046873 |
@@ -14879,6 +14881,10 @@ case $multi_os_directory in
|
|
|
0046873 |
dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
|
|
|
0046873 |
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
|
|
|
0046873 |
;;
|
|
|
0046873 |
+ ../lib*)
|
|
|
0046873 |
+ dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))'
|
|
|
0046873 |
+ ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
|
|
|
0046873 |
+ ;;
|
|
|
0046873 |
*)
|
|
|
0046873 |
dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
|
|
|
0046873 |
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
|