summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-01-26 12:59:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:31 -0500
commit34a03295d26d96302b4420c673afb33bdf875e77 (patch)
tree327404f0e289923ba85bae7714dd4f24126f0497
parentf725afe8fac4f4e6088299c8ba40960d4781e450 (diff)
downloadsamba-34a03295d26d96302b4420c673afb33bdf875e77.tar.gz
samba-34a03295d26d96302b4420c673afb33bdf875e77.tar.bz2
samba-34a03295d26d96302b4420c673afb33bdf875e77.zip
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)
-rw-r--r--source4/build/m4/check_path.m423
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 12 insertions, 13 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index b45368ccd9..293aac2427 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -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"
)
#################################################
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 022fcaa9bc..a7540bc9f9 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -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