summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 15:04:52 -0400
committermidipix <writeonce@midipix.org>2016-04-20 17:33:20 -0400
commit93cc8f74d2ad1dff9a6f44b382da267e595c0b64 (patch)
treedbd062cab6d778254432475fa9500ee14180e473
parentb6d1b54f16795de8e53cd05ababa2265a3111da5 (diff)
downloadsofort-93cc8f74d2ad1dff9a6f44b382da267e595c0b64.tar.bz2
sofort-93cc8f74d2ad1dff9a6f44b382da267e595c0b64.tar.xz
build system: set proper defaults to the various directory variables.
-rw-r--r--config.project12
-rwxr-xr-xconfigure19
2 files changed, 10 insertions, 21 deletions
diff --git a/config.project b/config.project
index ab3d89a..223729a 100644
--- a/config.project
+++ b/config.project
@@ -3,18 +3,6 @@ mb_package=sofort
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
-mb_default_syslibdir=lib
-mb_default_mandir=man
-mb_default_docdir=doc
-mb_default_libexecdir=libexec
-
-
# build
mb_default_build=
mb_default_host=
diff --git a/configure b/configure
index 4d83a9b..ae929c6 100755
--- a/configure
+++ b/configure
@@ -107,15 +107,16 @@ verify_build_directory()
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
- [ -z "$mb_syslibdir" ] && mb_syslibdir=$mb_default_syslibdir
- [ -z "$mb_mandir" ] && mb_mandir=$mb_default_mandir
- [ -z "$mb_docdir" ] && mb_docdir=$mb_default_docdir
- [ -z "$mb_libexecdir" ] && mb_libexecdir=$mb_default_libexecdir
+ [ -z "$mb_prefix" ] && mb_prefix='/usr/local'
+ [ -z "$mb_exec_prefix" ] && mb_exec_prefix=$mb_prefix
+ [ -z "$mb_bindir" ] && mb_bindir=$mb_exec_prefix/bin
+ [ -z "$mb_libdir" ] && mb_libdir=$mb_exec_prefix/lib
+ [ -z "$mb_includedir" ] && mb_includedir=$mb_prefix/include
+ [ -z "$mb_syslibdir" ] && mb_syslibdir=/lib
+ [ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share
+ [ -z "$mb_mandir" ] && mb_mandir=$mb_datarootdir/man
+ [ -z "$mb_docdir" ] && mb_docdir=$mb_datarootdir/doc
+ [ -z "$mb_libexecdir" ] && mb_libexecdir=$mb_exec_prefix/libexec
# build
[ -z "$mb_build" ] && mb_build=$mb_default_build