From b0daaedac081a344d867c05aff54b73751cdf43f Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Thu, 28 Apr 2011 13:40:23 +0000 Subject: - Try a little bit harder to detect .pc files. Now, it tries only .pc files with file path containing pkgconfig. This should avoid build failures when pkgconfig ends up trying to parse README.pc files of some packages. --- pkgconfigdeps.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgconfigdeps.sh') diff --git a/pkgconfigdeps.sh b/pkgconfigdeps.sh index 962f47d..b4dc125 100755 --- a/pkgconfigdeps.sh +++ b/pkgconfigdeps.sh @@ -17,8 +17,10 @@ case $1 in case "${filename}" in *.pc) # Assume that this file doesn't contain useful information. - pcfiles=${pcfiles}" ${filename}" - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then + pcfiles=${pcfiles}" ${filename}" + PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + fi ;; esac done @@ -39,8 +41,10 @@ case $1 in while read filename ; do case "${filename}" in *.pc) - pcfiles=${pcfiles}" ${filename}" - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then + pcfiles=${pcfiles}" ${filename}" + PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) + fi esac done if [ -n "$pcfiles" ] -- cgit v1.2.1