From 2816af2d8906165f25cb5ca382bac817596e4a70 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Apr 21 2016 07:06:02 +0000
Subject: build system: added --exec-prefix support.


---

diff --git a/Makefile.in b/Makefile.in
index cafa127..27194a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,6 +34,7 @@ ELF_HASH_STYLE 		= @elf_hash_style@
 ELF_CONFIG_DEFS 	= @elf_config_defs@
 
 PREFIX 			= @prefix@
+EXEC_PREFIX 		= @exec_prefix@
 BINDIR 			= @bindir@
 LIBDIR 			= @libdir@
 INCLUDEDIR 		= @includedir@
@@ -236,6 +237,7 @@ clean:
 
 .display-dirs:
 		@echo PREFIX:'                 '$(PREFIX)
+		@echo EXEC_PREFIX:'            '$(EXEC_PREFIX)
 		@echo BINDIR:'                 '$(BINDIR)
 		@echo LIBDIR:'                 '$(LIBDIR)
 		@echo INCLUDEDIR:'             '$(INCLUDEDIR)
diff --git a/config.project b/config.project
index 1727dcd..e65cad9 100644
--- a/config.project
+++ b/config.project
@@ -5,6 +5,7 @@ mb_require_out_of_tree=no
 
 # dirs
 mb_default_prefix=
+mb_default_exec_prefix=
 mb_default_bindir=bin
 mb_default_libdir=lib
 mb_default_includedir=include
diff --git a/config.usage b/config.usage
index fda5882..6437f60 100644
--- a/config.usage
+++ b/config.usage
@@ -5,6 +5,7 @@ supported switches:
 	--help
 
 	--prefix
+	--exec-prefix
 	--bindir
 	--libdir
 	--includedir
@@ -27,6 +28,7 @@ supported switches:
 supported variables:
 --------------------
 	PREFIX
+	EXEC_PREFIX
 	BINDIR
 	LIBDIR
 	INCLUDEDIR
diff --git a/configure b/configure
index ba30ace..cadb7ef 100755
--- a/configure
+++ b/configure
@@ -30,6 +30,7 @@ init_vars()
 
 	# dirs
 	mb_prefix=$PREFIX
+	mb_exec_prefix=$EXEC_PREFIX
 	mb_bindir=$BINDIR
 	mb_libdir=$LIBDIR
 	mb_includedir=$INCLUDEDIR
@@ -105,6 +106,7 @@ common_defaults()
 {
 	# dirs
 	[ -z "$mb_prefix" ] 		&& mb_prefix=$mb_default_prefix
+	[ -z "$mb_exec_prefix" ] 	&& mb_exec_prefix=$mb_default_exec_prefix
 	[ -z "$mb_bindir" ] 		&& mb_bindir=$mb_default_bindir
 	[ -z "$mb_libdir" ] 		&& mb_libdir=$mb_default_libdir
 	[ -z "$mb_includedir" ]		&& mb_includedir=$mb_default_includedir
@@ -331,6 +333,7 @@ config_copy()
 			-e 's^@elf_config\_defs@^'"$mb_elf_config_defs"'^g'		\
 											\
 			-e 's^@prefix@^'"$mb_prefix"'^g'				\
+			-e 's^@exec_prefix@^'"$mb_exec_prefix"'^g'			\
 			-e 's^@bindir@^'"$mb_bindir"'^g'				\
 			-e 's^@libdir@^'"$mb_libdir"'^g'				\
 			-e 's^@includedir@^'"$mb_includedir"'^g'			\
@@ -384,6 +387,9 @@ for arg ; do
 		--prefix=*)
 			mb_prefix=${arg#*=}
 			;;
+		--exec-prefix=*)
+			mb_exec_prefix=${arg#*=}
+			;;
 		--bindir=*)
 			mb_bindir=${arg#*=}
 			;;