package/libtool/patches/100-libdir_path.patch

   1 --- a/Makefile.in
   2 +++ b/Makefile.in
   3 @@ -789,6 +789,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
   4         -rm -f ltmain.shT
   5         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
   6         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
   7 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
   8             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
   9         mv -f ltmain.shT $@ || \
  10         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
  11 --- a/ltmain.in
  12 +++ b/ltmain.in
  13 @@ -2827,7 +2827,7 @@ EOF
  14               fi
  15             else
  16               # We cannot seem to hardcode it, guess we'll fake it.
  17 -             add_dir="-L$libdir"
  18 +             add_dir="-L@GLOBAL_LIBDIR@"
  19               # Try looking first in the location we're being installed to.
  20               if test -n "$inst_prefix_dir"; then
  21                 case $libdir in
  22 @@ -5669,7 +5669,7 @@ fi\
  23                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  24                   exit $EXIT_FAILURE
  25                 fi
  26 -               newdependency_libs="$newdependency_libs $libdir/$name"
  27 +               newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name"
  28                 ;;
  29               *) newdependency_libs="$newdependency_libs $deplib" ;;
  30               esac
  31 @@ -5694,7 +5694,7 @@ fi\
  32                 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  33                 exit $EXIT_FAILURE
  34               fi
  35 -             newdlprefiles="$newdlprefiles $libdir/$name"
  36 +             newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name"
  37             done
  38             dlprefiles="$newdlprefiles"
  39           else
  40 --- a/Makefile.am
  41 +++ b/Makefile.am
  42 @@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
  43         -rm -f ltmain.shT
  44         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
  45         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
  46 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
  47             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
  48         mv -f ltmain.shT $@ || \
  49         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)