692d2f5536b8d6d22f6ed0b7e88deeec8d3bf2fe
[openwrt/svn-archive/archive.git] / package / libtool / patches / 100-libdir_path.patch
1 Index: libtool-1.5.24/Makefile.in
2 ===================================================================
3 --- libtool-1.5.24.orig/Makefile.in 2007-06-24 04:20:36.000000000 +0200
4 +++ libtool-1.5.24/Makefile.in 2007-12-26 04:39:04.171194995 +0100
5 @@ -789,6 +789,7 @@
6 -rm -f ltmain.shT
7 date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
8 sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
9 + -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
10 -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
11 mv -f ltmain.shT $@ || \
12 (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
13 Index: libtool-1.5.24/ltmain.in
14 ===================================================================
15 --- libtool-1.5.24.orig/ltmain.in 2007-12-26 04:39:09.151478801 +0100
16 +++ libtool-1.5.24/ltmain.in 2007-12-26 04:43:31.962455550 +0100
17 @@ -5675,7 +5675,7 @@
18 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
19 exit $EXIT_FAILURE
20 fi
21 - newdependency_libs="$newdependency_libs $libdir/$name"
22 + newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name"
23 ;;
24 *) newdependency_libs="$newdependency_libs $deplib" ;;
25 esac
26 @@ -5700,7 +5700,7 @@
27 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
28 exit $EXIT_FAILURE
29 fi
30 - newdlprefiles="$newdlprefiles $libdir/$name"
31 + newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name"
32 done
33 dlprefiles="$newdlprefiles"
34 else