summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-01-17 12:29:53 +0100
committerStefan Metzmacher <metze@samba.org>2012-01-17 13:08:34 +0100
commit0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea (patch)
treeb342d2bcbc9a0d3c5f0d7462fcf5a582f4099cc6
parent7d83d379ad2424dfd88cbfbab1b7dbae06b23bd1 (diff)
downloadsamba-0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea.tar.gz
samba-0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea.tar.bz2
samba-0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea.zip
dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and datarootdir in Makefile
Otherwise $prefix is "NONE" without explicit --prefix metze
-rw-r--r--dynconfig/config.m436
1 files changed, 18 insertions, 18 deletions
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index e7a7228e8a..097b9305f6 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -30,15 +30,15 @@ if test x$enable_fhs != xyes; then
SWATDIR="${datadir}/swat"
CODEPAGEDIR="${datadir}/codepages"
PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="${sysconfdir}"
- PRIVATE_DIR="${prefix}/private"
- LOCKDIR="${localstatedir}/lock"
- PIDDIR="${localstatedir}/run"
- STATEDIR="${localstatedir}/locks"
- CACHEDIR="${localstatedir}/cache"
- LOGFILEBASE="${localstatedir}"
- SOCKET_DIR="${localstatedir}/run"
- PRIVILEGED_SOCKET_DIR="${localstatedir}/lib"
+ CONFIGDIR="\${sysconfdir}"
+ PRIVATE_DIR="\${prefix}/private"
+ LOCKDIR="\${localstatedir}/lock"
+ PIDDIR="\${localstatedir}/run"
+ STATEDIR="\${localstatedir}/locks"
+ CACHEDIR="\${localstatedir}/cache"
+ LOGFILEBASE="\${localstatedir}"
+ SOCKET_DIR="\${localstatedir}/run"
+ PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib"
else
AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
@@ -49,15 +49,15 @@ else
SWATDIR="${datadir}/samba/swat"
CODEPAGEDIR="${datadir}/samba/codepages"
PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="${sysconfdir}/samba"
- PRIVATE_DIR="${localstatedir}/lib/samba/private"
- LOCKDIR="${localstatedir}/lock/samba"
- PIDDIR="${localstatedir}/run/samba"
- STATEDIR="${localstatedir}/lib/samba"
- CACHEDIR="${localstatedir}/cache/samba"
- LOGFILEBASE="${localstatedir}/log/samba"
- SOCKET_DIR="${localstatedir}/run/samba"
- PRIVILEGED_SOCKET_DIR="${localstatedir}/lib/samba"
+ CONFIGDIR="\${sysconfdir}/samba"
+ PRIVATE_DIR="\${localstatedir}/lib/samba/private"
+ LOCKDIR="\${localstatedir}/lock/samba"
+ PIDDIR="\${localstatedir}/run/samba"
+ STATEDIR="\${localstatedir}/lib/samba"
+ CACHEDIR="\${localstatedir}/cache/samba"
+ LOGFILEBASE="\${localstatedir}/log/samba"
+ SOCKET_DIR="\${localstatedir}/run/samba"
+ PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
fi
AC_ARG_WITH(pammodulesdir,