diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 18:01:49 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-21 03:07:21 -0400 |
| commit | 452aa8ea21d60341af4850577ccbcf696b8cd1af (patch) | |
| tree | 4ab56826c3b966b3177ce889a651a5e23a44276d | |
| parent | 2d45c921811e8dbb3833b5a9a68db9d2a4b0cc1c (diff) | |
| download | ntcon-452aa8ea21d60341af4850577ccbcf696b8cd1af.tar.bz2 ntcon-452aa8ea21d60341af4850577ccbcf696b8cd1af.tar.xz | |
build system: added --exec-prefix support.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | config.project | 1 | ||||
| -rw-r--r-- | config.usage | 2 | ||||
| -rwxr-xr-x | configure | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 6c0b64f..ec681f2 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 fbdd994..bb04eca 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 @@ -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#*=} ;; |