1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and datarootdir in Makefile

Otherwise $prefix is "NONE" without explicit --prefix

metze
This commit is contained in:
Stefan Metzmacher 2012-01-17 12:29:53 +01:00
parent 7d83d379ad
commit 0ca1f321ac

View File

@ -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,