mirror of
https://github.com/samba-team/samba.git
synced 2025-01-25 06:04:04 +03:00
r13163: as we don't import the raw magic configure vars for
libdir, datadir, sysconfdir,localstatedir into our Makefile we need to expand them in configure I'll maybe rework this later but for now this works metze (This used to be commit 615b82f7c73ff52ab62489ec635aefecf2b2f04c)
This commit is contained in:
parent
f725afe8fa
commit
34a03295d2
@ -12,20 +12,21 @@ dnl
|
||||
AC_PREFIX_DEFAULT(/usr/local/samba)
|
||||
|
||||
# Defaults and --without-fhs
|
||||
logfilebase="\${localstatedir}"
|
||||
lockdir="\${localstatedir}/locks"
|
||||
piddir="\${localstatedir}/run"
|
||||
privatedir="\${prefix}/private"
|
||||
logfilebase="${localstatedir}"
|
||||
lockdir="${localstatedir}/locks"
|
||||
piddir="${localstatedir}/run"
|
||||
privatedir="${prefix}/private"
|
||||
|
||||
AC_ARG_WITH(fhs,
|
||||
[ --with-fhs Use FHS-compliant paths (default=no)],
|
||||
lockdir="\${localstatedir}/lib/samba"
|
||||
piddir="\${localstatedir}/run/samba"
|
||||
logfilebase="\${localstatedir}/log/samba"
|
||||
privatedir="\${localstatedir}/lib/samba/private"
|
||||
libdir="\${libdir}/samba"
|
||||
datadir="\${datadir}/samba"
|
||||
includedir="\${includedir}/samba-4.0"
|
||||
lockdir="${localstatedir}/lib/samba"
|
||||
piddir="${localstatedir}/run/samba"
|
||||
logfilebase="${localstatedir}/log/samba"
|
||||
privatedir="${localstatedir}/lib/samba/private"
|
||||
sysconfdir="${sysconfdir}/samba"
|
||||
libdir="${libdir}/samba"
|
||||
datadir="${datadir}/samba"
|
||||
includedir="${includedir}/samba-4.0"
|
||||
)
|
||||
|
||||
#################################################
|
||||
|
@ -70,12 +70,10 @@ builddir = $self->{config}->{builddir}
|
||||
BASEDIR = $self->{config}->{prefix}
|
||||
BINDIR = $self->{config}->{bindir}
|
||||
SBINDIR = $self->{config}->{sbindir}
|
||||
datadir = $self->{config}->{datadir}
|
||||
LIBDIR = $self->{config}->{libdir}
|
||||
MODULESDIR = $self->{config}->{libdir}
|
||||
INCLUDEDIR = $self->{config}->{includedir}
|
||||
CONFIGDIR = $self->{config}->{sysconfdir}
|
||||
localstatedir = $self->{config}->{localstatedir}
|
||||
SWATDIR = $self->{config}->{datadir}/swat
|
||||
JSDIR = $self->{config}->{datadir}/js
|
||||
SETUPDIR = $self->{config}->{datadir}/setup
|
||||
|
Loading…
x
Reference in New Issue
Block a user