summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-24 15:11:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:32 -0500
commitb873c1789faf4413dcd30e934135ce3517510408 (patch)
tree51563db8dc26b8e85aa79767ef43842ecae4cc52 /source4
parent11f4803d002bf5a4bba24103d6c472ea638e196e (diff)
downloadsamba-b873c1789faf4413dcd30e934135ce3517510408.tar.gz
samba-b873c1789faf4413dcd30e934135ce3517510408.tar.bz2
samba-b873c1789faf4413dcd30e934135ce3517510408.zip
r9587: Fix SWAT data dir for --with-fhs
(This used to be commit 53d0c3e4852c977901a6bdbe196e0d00753beeda)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_path.m42
-rw-r--r--source4/build/smb_build/makefile.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 174ef85f11..3c626ee0d0 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -19,7 +19,7 @@ AC_ARG_WITH(fhs,
logfilebase="\${localstatedir}/log/samba"
privatedir="\${CONFIGDIR}/private"
libdir="\${prefix}/lib/samba"
- swatdir="\${DATADIR}/samba/swat",
+ swatdir="\${datadir}/samba/swat",
configdir="\${LIBDIR}"
logfilebase="\${localstatedir}"
lockdir="\${localstatedir}/locks"
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b43a738613..e2ab304adc 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -26,6 +26,7 @@ builddir = @builddir@
BASEDIR = @prefix@
BINDIR = @bindir@
SBINDIR = @sbindir@
+datadir = @datadir@
LIBDIR = @libdir@
CONFIGDIR = @configdir@
localstatedir = @localstatedir@