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

diff --git a/source/build/m4/check_path.m4 b/source/build/m4/check_path.m4
index b45368ccd9696f46405011a6a09a769966be5e23..293aac2427fb73e88b7c127b09b40e3dfab6f0f5 100644 (file)
--- a/source/build/m4/check_path.m4
+++ b/source/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/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 022fcaa9bc2aeffc3f37ceb1f32a24f76a355ffb..a7540bc9f9abc36554d4c398c36f49f8b18adff3 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/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