sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

r13163: as we don't import the raw magic configure vars for

Browse Source 
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 615b82f7c7)
This commit is contained in:
Stefan Metzmacher 2006-01-26 12:59:55 +00:00 committed by Gerald (Jerry) Carter
parent f725afe8fa
commit 34a03295d2
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source4/build/m4/check_path.m4
View File

@ -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"
)
#################################################

2
source4/build/smb_build/makefile.pm
View File

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