From da29c8521b966c09ba93f1c24b86196b2e6e7a5e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 8 Sep 2014 12:08:38 +0200 Subject: sync (4:8) define PKG_CONFIG_PATH like upstream --- pkgconfigdeps.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgconfigdeps.sh b/pkgconfigdeps.sh index 8183bb4..d2c72e3 100755 --- a/pkgconfigdeps.sh +++ b/pkgconfigdeps.sh @@ -22,7 +22,8 @@ case $1 in case "${filename}" in *.pc) pcfiles=${pcfiles}" ${filename}" - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + DIR="`dirname ${filename}`" + PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" # Query the dependencies of the package. PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-provides $pcfiles | while read n r v ; do # We have a dependency. Make a note that we need the pkgconfig @@ -41,7 +42,8 @@ case $1 in case "${filename}" in *.pc) pcfiles=${pcfiles}" ${filename}" - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + DIR="`dirname ${filename}`" + PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-requires --print-requires-private ${pcfiles} | while read n r v ; do test -z "$v" && test -n "$r" && echo "Error with pkgconfig($n)" >&2 && exit 1 echo "pkgconfig($n)" "$r" "$v" -- cgit v1.2.1