From 794058a4af18344b05122f84b40982e0a0fd7cd3 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 21 Aug 2019 09:31:15 +0000 Subject: build system: pkgconf.sh: properly handle empty prefix variable. --- sofort/tools/pkgconf.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sofort/tools/pkgconf.sh') diff --git a/sofort/tools/pkgconf.sh b/sofort/tools/pkgconf.sh index 614fdec..392647a 100755 --- a/sofort/tools/pkgconf.sh +++ b/sofort/tools/pkgconf.sh @@ -20,6 +20,10 @@ else prefix=$(dirname "$PKGCONF_INCLUDEDIR") base=$(basename "$PKGCONF_INCLUDEDIR") + if [ "$prefix" = '/' ]; then + prefix= + fi + if [ "$prefix/$base" = "$PKGCONF_PREFIX/$base" ]; then pkgconf_includedir='${prefix}/'"${base}" pkgconf_cflags='-I${includedir}' @@ -37,6 +41,10 @@ else prefix=$(dirname "$PKGCONF_LIBDIR") base=$(basename "$PKGCONF_LIBDIR") + if [ "$prefix" = '/' ]; then + prefix= + fi + if [ "$prefix/$base" = "$PKGCONF_EXEC_PREFIX/$base" ]; then pkgconf_libdir='${exec_prefix}/'"${base}" else -- cgit v1.2.3