From 1189ff23c9cfd63ae302ec13ea71227a2f902599 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 1 Feb 2017 09:49:05 +0000 Subject: [PATCH] BUG: pkgconfigPrefix calling the incorrect backend ENH: avoid editing pkgconfig symlinks --- etc/pkgconfigPrefix | 2 +- etc/tools/ThirdPartyFunctions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/pkgconfigPrefix b/etc/pkgconfigPrefix index 849eb83..5c8156e 100755 --- a/etc/pkgconfigPrefix +++ b/etc/pkgconfigPrefix @@ -76,7 +76,7 @@ do usage ;; *) - pkgconfigAdjust "$1" + pkgconfigNewPrefix "$1" ;; esac shift diff --git a/etc/tools/ThirdPartyFunctions b/etc/tools/ThirdPartyFunctions index fd57ed1..b76e9a3 100644 --- a/etc/tools/ThirdPartyFunctions +++ b/etc/tools/ThirdPartyFunctions @@ -281,7 +281,7 @@ pkgconfigNewPrefix() [ -d "$dir/$libdir" ] || continue for i in $dir/$libdir/*.pc do - if [ -f "$i" ] + if [ -f "$i" -a ! -L "$i" ] then nfiles="x$nfiles" sed -i -e 's@^\(prefix=\).*$@\1'"$dir@" $i @@ -329,7 +329,7 @@ pkgconfigAdjust() [ -d "$dir/$libdir" ] || continue for i in $dir/$libdir/*.pc do - if [ -f "$i" ] + if [ -f "$i" -a ! -L "$i" ] then nfiles="x$nfiles" sed -i \