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-12-28 17:45:43.195523115 +0100
   4 +++ libtool-1.5.24/Makefile.in  2007-12-28 17:45:58.032368617 +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-28 17:45:43.203523567 +0100
  16 +++ libtool-1.5.24/ltmain.in    2007-12-28 17:45:58.036368842 +0100
  17 @@ -5669,7 +5669,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 @@ -5694,7 +5694,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
  35 Index: libtool-1.5.24/Makefile.am
  36 ===================================================================
  37 --- libtool-1.5.24.orig/Makefile.am     2007-12-28 17:46:04.428733124 +0100
  38 +++ libtool-1.5.24/Makefile.am  2007-12-28 17:46:38.494674431 +0100
  39 @@ -67,6 +67,7 @@
  40         -rm -f ltmain.shT
  41         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
  42         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
  43 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
  44             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
  45         mv -f ltmain.shT $@ || \
  46         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)