summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 17:40:15 -0400
committermidipix <writeonce@midipix.org>2016-04-20 17:40:15 -0400
commitcf45365ddf68e82a99a5b552071db65f6f3cf745 (patch)
tree5fdd2c3c1a78b315e2c64827475ff89cf2bea5c3
parentae9f084ffb52813b8e46c57cf3f6dd5d329594d5 (diff)
downloaddalist-cf45365ddf68e82a99a5b552071db65f6f3cf745.tar.bz2
dalist-cf45365ddf68e82a99a5b552071db65f6f3cf745.tar.xz
build system: added --exec-prefix support.
-rw-r--r--Makefile.in2
-rw-r--r--config.project1
-rw-r--r--config.usage2
-rwxr-xr-xconfigure6
4 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index c6b7c2f..809dde9 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@
@@ -230,6 +231,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 1a66860..d17a195 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#*=}
;;