summaryrefslogtreecommitdiff
path: root/package/libtool/patches/100-libdir_path.patch
blob: 08c4c6806a30c0b2bded46dc6a1907faf327fdb6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- 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)