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