patch Makefile.am for GLOBAL_LIBDIR as well

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9988 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
index 692d2f5..8ce01e7 100644 (file)
--- a/package/libtool/patches/100-libdir_path.patch
+++ b/package/libtool/patches/100-libdir_path.patch
@@ -1,7 +1,7 @@
 Index: libtool-1.5.24/Makefile.in
 ===================================================================
---- libtool-1.5.24.orig/Makefile.in    2007-06-24 04:20:36.000000000 +0200
-+++ libtool-1.5.24/Makefile.in 2007-12-26 04:39:04.171194995 +0100
+--- libtool-1.5.24.orig/Makefile.in    2007-12-28 17:45:43.195523115 +0100
++++ libtool-1.5.24/Makefile.in 2007-12-28 17:45:58.032368617 +0100
 @@ -789,6 +789,7 @@
        -rm -f ltmain.shT
        date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
@@ -12,9 +12,9 @@ Index: libtool-1.5.24/Makefile.in
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
 Index: libtool-1.5.24/ltmain.in
 ===================================================================
---- libtool-1.5.24.orig/ltmain.in      2007-12-26 04:39:09.151478801 +0100
-+++ libtool-1.5.24/ltmain.in   2007-12-26 04:43:31.962455550 +0100
-@@ -5675,7 +5675,7 @@
+--- libtool-1.5.24.orig/ltmain.in      2007-12-28 17:45:43.203523567 +0100
++++ libtool-1.5.24/ltmain.in   2007-12-28 17:45:58.036368842 +0100
+@@ -5669,7 +5669,7 @@
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit $EXIT_FAILURE
                fi
@@ -23,7 +23,7 @@ Index: libtool-1.5.24/ltmain.in
                ;;
              *) newdependency_libs="$newdependency_libs $deplib" ;;
              esac
-@@ -5700,7 +5700,7 @@
+@@ -5694,7 +5694,7 @@
                $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
                exit $EXIT_FAILURE
              fi
@@ -32,3 +32,15 @@ Index: libtool-1.5.24/ltmain.in
            done
            dlprefiles="$newdlprefiles"
          else
+Index: libtool-1.5.24/Makefile.am
+===================================================================
+--- libtool-1.5.24.orig/Makefile.am    2007-12-28 17:46:04.428733124 +0100
++++ libtool-1.5.24/Makefile.am 2007-12-28 17:46:38.494674431 +0100
+@@ -67,6 +67,7 @@
+       -rm -f ltmain.shT
+       date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
+       sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
++              -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
+           -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
+       mv -f ltmain.shT $@ || \
+       (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)