build: Put lockdir and cachedir in FHS-like locations by default

This does not move statedir, leaving it in PREFIX/var/locks because
state files such as idmap are dangerous to move, as they might
re-create, causing chaos.

This isn't ideal, but I don't have a better solution right now.

Andrew Bartlett

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 347c5bd0b2b3c063fa5e5a77a75b0da9696d521d..12fc17fe0ef9345acd82d87a21cbe87d7a1d08af 100755 (executable)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -9,8 +9,8 @@ dir_options = {
     'with-privatedir'                     : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
     'with-sockets-dir'                    : [ '${LOCALSTATEDIR}/run', 'sockets directory' ],
     'with-winbindd-privileged-socket-dir' : [ '${LOCALSTATEDIR}/lib/winbindd_privileged', 'winbind privileged socket directory'],
-    'with-lockdir'                        : [ '${LOCALSTATEDIR}/locks', 'where to put short term disposable state files' ],
-    'with-cachedir'                       : [ '${LOCALSTATEDIR}/locks', 'where to put cache files' ],
+    'with-lockdir'                        : [ '${LOCALSTATEDIR}/lock', 'where to put short term disposable state files' ],
+    'with-cachedir'                       : [ '${LOCALSTATEDIR}/cache', 'where to put cache files' ],
     'with-logfilebase'                    : [ '${LOCALSTATEDIR}', 'Where to put log files' ],
     'with-pammodulesdir'                  : [ '${LIBDIR}', 'Which directory to use for PAM modules' ],
     'with-statedir'                       : [ '${LOCALSTATEDIR}/locks', 'where to put persistent state files' ],