[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  456351c... s4-waf: follow the configure directories for the empty install dirs
      from  d25e1e1... build: update waf from svn

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 456351cdb184f59374cecec8d7c44add29b986dd
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 21:54:40 2010 +1000

    s4-waf: follow the configure directories for the empty install dirs
    
    Thanks to Metze for spotting this

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wafsamba.py |    2 ++
 source4/wscript_build           |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c3dd32c..0f6a4fe 100644
--- 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 788fdba..ff83f93 100644
--- 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")


-- 
Samba Shared Repository