From ba85243ef4f90c022502604a8faadbc4e7d8f439 Mon Sep 17 00:00:00 2001
From: Vadim Kochan <vadim4j@gmail.com>
Date: Tue, 23 Aug 2016 00:17:11 +0300
Subject: build: configure: Add option to specify install path for binary files

Add new --prefix=PREFIX configure commandline option to specify
installation directory for binaries.

Add additional check in 'Cmds' file if --prefix was specified
from 'configure' script, in that case required installation path
components will be created automatically as it is done for
'make PREFIX=...' option.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 Cmds      |  7 ++++++-
 configure | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Cmds b/Cmds
index 7167e0c..159939e 100644
--- a/Cmds
+++ b/Cmds
@@ -29,7 +29,12 @@ ifeq ("$(origin PREFIX)", "command line")
   INSTX = echo -e "  INST\t$(1)" && install -d $(2) && \
 	install -C $(1) $(2)/$(shell basename $(1))
 else
-  INSTX = echo -e "  INST\t$(1)" && install -C $(1) $(2)/$(shell basename $(1))
+  ifeq ("$(origin PREFIX)", "file")
+    INSTX = echo -e "  INST\t$(1)" && install -d $(2) && \
+	  install -C $(1) $(2)/$(shell basename $(1))
+  else
+    INSTX = echo -e "  INST\t$(1)" && install -C $(1) $(2)/$(shell basename $(1))
+  endif
 endif
 
 MKDIR = echo -e  "  MKDIR\t$(1)" && mkdir -p $(1)
diff --git a/configure b/configure
index 4a5b7e3..db9727c 100755
--- a/configure
+++ b/configure
@@ -24,12 +24,24 @@ DISABLE_GEOIP=0
 DISABLE_ZLIB=0
 ENABLE_DEBUG=0
 
+PREFIX="/usr/local"
+HAVE_PREFIX=0
+
 usage()
 {
 	echo "Usage: ./configure [OPTION]... [VAR=VALUE]..."
 	echo ""
 	echo "  -h, --help       Display this help and exit"
 	echo ""
+	echo "Installation directories:"
+	echo "  --prefix=PREFIX  install architecture-independent files in PREFIX"
+	echo "                   [$PREFIX]"
+	echo ""
+	echo "By default, \`make install' will install all the files in"
+	echo "\`$PREFIX/bin', \`$PREFIX/lib' etc.  You can specify"
+	echo "an installation prefix other than \`$PREFIX' using \`--prefix',"
+	echo "for instance \`--prefix=\$HOME'."
+	echo ""
 	echo "Optional Features:"
 	echo "  --disable-libnl  Disable libnl support"
 	echo "  --disable-geoip  Disable geoip support"
@@ -48,6 +60,10 @@ while [ $# -gt 0 ] ; do
 	-h|--help)
 		usage
 		;;
+	--prefix=*)
+		PREFIX="${1#*=}"
+		HAVE_PREFIX=1
+		;;
 	--disable-libnl)
 		DISABLE_LIBNL=1
 		;;
@@ -794,6 +810,10 @@ else
 	echo "CONFIG_GEOIP=0" >> Config
 fi
 
+if [ "$HAVE_PREFIX" == "1" ] ; then
+	echo "PREFIX=$PREFIX" >> Config
+fi
+
 echo "CONFIG_DEBUG=$ENABLE_DEBUG" >> Config
 echo "CONFIG_TOOLS=$TOOLS" >> Config
 echo "CONFIG_OK=1" >> Config
-- 
cgit v1.2.3-54-g00ecf