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

This reverts commit 6c9a78074a429773cefd1a3c798b7e3ad7d4c325.

diff --git a/dynconfig/wscript b/dynconfig/wscript
index d6b07efb5ddb4c5e45171cf72df9ed503be19a9d..ccb181c1024d08540b1ca1a9d8cb0db03dbaecb8 100755 (executable)
--- a/dynconfig/wscript
+++ b/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}/lock', 'where to put short term disposable state files' ],
-    'with-cachedir'                       : [ '${LOCALSTATEDIR}/cache', 'where to put cache files' ],
+    'with-lockdir'                        : [ '${LOCALSTATEDIR}/locks', 'where to put short term disposable state files' ],
+    'with-cachedir'                       : [ '${LOCALSTATEDIR}/locks', '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' ],