mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -789,6 +789,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
|
|
-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)
|
|
--- a/ltmain.in
|
|
+++ b/ltmain.in
|
|
@@ -5669,7 +5669,7 @@ fi\
|
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
exit $EXIT_FAILURE
|
|
fi
|
|
- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
+ newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name"
|
|
;;
|
|
*) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
esac
|
|
@@ -5694,7 +5694,7 @@ fi\
|
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
|
exit $EXIT_FAILURE
|
|
fi
|
|
- newdlprefiles="$newdlprefiles $libdir/$name"
|
|
+ newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name"
|
|
done
|
|
dlprefiles="$newdlprefiles"
|
|
else
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
|
|
-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)
|