svn commit: samba r9587 - in branches/SAMBA_4_0/source/build: m4 smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2005-08-24 15:11:13 +0000 (Wed, 24 Aug 2005)
New Revision: 9587

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9587

Log:
Fix SWAT data dir for --with-fhs

Modified:
   branches/SAMBA_4_0/source/build/m4/check_path.m4
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_path.m4	2005-08-24 14:13:58 UTC (rev 9586)
+++ branches/SAMBA_4_0/source/build/m4/check_path.m4	2005-08-24 15:11:13 UTC (rev 9587)
@@ -19,7 +19,7 @@
     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"

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-08-24 14:13:58 UTC (rev 9586)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-08-24 15:11:13 UTC (rev 9587)
@@ -26,6 +26,7 @@
 BASEDIR = @prefix@
 BINDIR = @bindir@
 SBINDIR = @sbindir@
+datadir = @datadir@
 LIBDIR = @libdir@
 CONFIGDIR = @configdir@
 localstatedir = @localstatedir@