aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard <rtp@mageia.org>2011-04-28 13:40:23 (GMT)
committerArnaud Patard <rtp@mageia.org>2011-04-28 13:40:23 (GMT)
commitb0daaedac081a344d867c05aff54b73751cdf43f (patch)
tree55a3e4d2db67deb46fd785172be65f7fa42b10c5
parent508eff45fdc19b48ebd43b343a45b7f53085afea (diff)
- 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.
-rwxr-xr-xpkgconfigdeps.sh12
1 files changed, 8 insertions, 4 deletions
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" ]