diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-09-08 12:08:38 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-09-09 15:06:23 +0200 |
| commit | da29c8521b966c09ba93f1c24b86196b2e6e7a5e (patch) | |
| tree | b92a7701312e56a6298fa4c5ca910bed0c3d5650 | |
| parent | 109369cd0582b76a7a4a559bb4d84820bbed1cdf (diff) | |
| download | rpm-setup-da29c8521b966c09ba93f1c24b86196b2e6e7a5e.tar rpm-setup-da29c8521b966c09ba93f1c24b86196b2e6e7a5e.tar.gz rpm-setup-da29c8521b966c09ba93f1c24b86196b2e6e7a5e.tar.bz2 rpm-setup-da29c8521b966c09ba93f1c24b86196b2e6e7a5e.tar.xz rpm-setup-da29c8521b966c09ba93f1c24b86196b2e6e7a5e.zip | |
sync (4:8) define PKG_CONFIG_PATH like upstream
| -rwxr-xr-x | pkgconfigdeps.sh | 6 |
1 files 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" |