X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=misc%2Fgen-pkgconfig.in;h=89a5cd4a3180b6b88233cb6ae2bb2d4256485cc0;hb=c5ffd7a7937e457fc772888b61a15544e4244c32;hp=a45dd54f0fc491c5acad772f2395eb71f06c1a15;hpb=0af9283ca273c267ee6036c3b88115d9ba6d55a6;p=ncurses.git

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index a45dd54f..89a5cd4a 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.52 2021/08/07 21:36:33 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -98,9 +98,16 @@ do
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
 		continue
 		;;
+	-Wl,--as-needed|-Wl,--build-id=*|-Wl,-dT,*|-Wl,-T,*)
+		continue
+		;;
 	-L*)
 		lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
-		[ -d "$lib_check" ] || continue
+		# on a new/nonstandard install, $libdir may not yet exist at this point
+		if [ "$libdir" != "$lib_check" ]
+		then
+			[ -d "$lib_check" ] || continue
+		fi
 		case "$lib_check" in
 		@LD_SEARCHPATH@) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
@@ -167,7 +174,7 @@ fi
 
 # The "URL" feature came in pkg-config 0.17
 USEURL=""
-CFGVER=`pkg-config --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{print $2;}'`
+CFGVER=`${PKG_CONFIG:-pkg-config} --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{print $2;}'`
 # A missing version should simply fail, but some packagers insist on building
 # packages on machines which do not actually have the tools they depend on at
 # runtime.
@@ -219,7 +226,7 @@ do
 
 	echo "** creating ${name}${suffix}.pc"
 	cat >${name}${suffix}.pc <<EOF
-# pkg-config file generated by `basename $0`
+# pkg-config file generated by `basename "$0"`
 # vile:makemode
 
 prefix=$show_prefix