diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 14:57:34 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-20 17:21:49 -0400 |
| commit | 4a022e9259a81ebb2e97729dc878bf5ebc85a4e1 (patch) | |
| tree | b6324517ff710940bd2f197567d0280eb5b082a5 | |
| parent | 2b698191af9dde955ccc3d4dcefb897cf60056e6 (diff) | |
| download | slibtool-4a022e9259a81ebb2e97729dc878bf5ebc85a4e1.tar.bz2 slibtool-4a022e9259a81ebb2e97729dc878bf5ebc85a4e1.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 37216a7..78af5ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,6 +36,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@ @@ -279,6 +280,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 bb734a7..33d8bda 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 @@ -107,6 +108,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 @@ -337,6 +339,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' \ @@ -390,6 +393,9 @@ for arg ; do --prefix=*) mb_prefix=${arg#*=} ;; + --exec-prefix=*) + mb_exec_prefix=${arg#*=} + ;; --bindir=*) mb_bindir=${arg#*=} ;; |