s4-waf: follow the configure directories for the empty install dirs

Thanks to Metze for spotting this

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c3dd32c97d94e2b24471020bf4f335154f4c80ed..0f6a4fe28e1158a70831aa168f0fd6c95d27cbb6 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -600,6 +600,8 @@ Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
 
 def INSTALL_DIRS(bld, destdir, dirs):
     '''install a set of directories'''
+    destdir = bld.EXPAND_VARIABLES(destdir)
+    dirs = bld.EXPAND_VARIABLES(dirs)
     for d in TO_LIST(dirs):
         bld.install_dir(os.path.join(destdir, d))
 Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS

diff --git a/source4/wscript_build b/source4/wscript_build
index 788fdba2a5b5f92cedfa68bda0f224444aa5b90e..ff83f93e785846016d5e1aafbfc2bfddfd1f224e 100644 (file)
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -118,4 +118,4 @@ bld.RECURSE('../pidl')
 bld.RECURSE('../lib')
 
 # install some extra empty directories
-bld.INSTALL_DIRS("${PREFIX}", "etc var/lib var/locks var/run")
+bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib")