• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
2index a45dd54..8527305 100644
3--- a/misc/gen-pkgconfig.in
4+++ b/misc/gen-pkgconfig.in
5@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then
6 fi
7
8 lib_flags=
9-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
10+for opt in -L$libdir @LIBS@
11 do
12 	case $opt in
13 	-l*) # LIBS is handled specially below
14diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
15index 7b02ac2..b64379f 100644
16--- a/misc/ncurses-config.in
17+++ b/misc/ncurses-config.in
18@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
19
20 bindir="@bindir@"
21 includedir="@includedir@"
22-libdir="@libdir@"
23 datarootdir="@datarootdir@"
24 datadir="@datadir@"
25 mandir="@mandir@"
26@@ -101,7 +100,7 @@ fi
27 # There is no portable way to find the list of standard library directories.
28 # Require a POSIX shell anyway, to keep this simple.
29 lib_flags=
30-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
31+for opt in $LIBS
32 do
33 	case $opt in
34 	-specs*) # ignore linker specs-files which were used to build library
35@@ -117,13 +116,13 @@ do
36 		lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
37 		[ -d "$lib_check" ] || continue
38 		case "$lib_check" in
39-		@LD_SEARCHPATH@) # skip standard libdir
40+		////) # skip standard libdir (disabled for multilib)
41 			if [ "$lib_check" = "$libdir" ]
42 			then
43 				lib_first=yes
44 				IFS_save="$IFS"
45 				IFS='|'
46-				LIBDIRS="@LD_SEARCHPATH@"
47+				LIBDIRS=""
48 				for lib_check in $LIBDIRS
49 				do
50 					if [ -d "$lib_check" ]
51@@ -271,7 +270,6 @@ ENDECHO
52 		echo "$INCS"
53 		;;
54 	--libdir)
55-		echo "${libdir}"
56 		;;
57 	--mandir)
58 		echo "${mandir}"
59--
602.33.0