aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-02-24 15:19:20 +0000
committerMatthew Wild <mwild1@gmail.com>2015-02-24 15:19:20 +0000
commitdee60b3659ffc63332d0ee011a687aba24b71f26 (patch)
treef9c3fcd5098cfc5cf73a5c1525e2dca20ba54390
parent79b30c593a41c0d90aa29574f82fe20f9dd8be63 (diff)
downloadprosody-dee60b3659ffc63332d0ee011a687aba24b71f26.tar.gz
prosody-dee60b3659ffc63332d0ee011a687aba24b71f26.zip
configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and --libdir isn't (thanks Medics)
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index c27517fc..199f5fcf 100755
--- a/configure
+++ b/configure
@@ -139,6 +139,7 @@ do
;;
--libdir=*)
LIBDIR="$value"
+ LIBDIR_SET=yes
;;
--datadir=*)
DATADIR="$value"
@@ -213,6 +214,11 @@ then
fi
fi
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+ LIBDIR=$PREFIX/lib
+fi
+
find_program() {
path="$PATH"
item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"