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 @@ -5669,7 +5669,7 @@ fi\
  14                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  15                   exit $EXIT_FAILURE
  16                 fi
  17 -               newdependency_libs="$newdependency_libs $libdir/$name"
  18 +               newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name"
  19                 ;;
  20               *) newdependency_libs="$newdependency_libs $deplib" ;;
  21               esac
  22 @@ -5694,7 +5694,7 @@ fi\
  23                 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  24                 exit $EXIT_FAILURE
  25               fi
  26 -             newdlprefiles="$newdlprefiles $libdir/$name"
  27 +             newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name"
  28             done
  29             dlprefiles="$newdlprefiles"
  30           else
  31 --- a/Makefile.am
  32 +++ b/Makefile.am
  33 @@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
  34         -rm -f ltmain.shT
  35         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
  36         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
  37 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \
  38             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
  39         mv -f ltmain.shT $@ || \
  40         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)