diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-19 21:54:40 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-19 21:54:40 +1000 |
| commit | 456351cdb184f59374cecec8d7c44add29b986dd (patch) | |
| tree | cea800f713c73ba84daab40d04fdfafaca276390 | |
| parent | d25e1e15d387d24fe045fbb162de57963c7b15a6 (diff) | |
| download | samba-456351cdb184f59374cecec8d7c44add29b986dd.tar.gz samba-456351cdb184f59374cecec8d7c44add29b986dd.tar.bz2 samba-456351cdb184f59374cecec8d7c44add29b986dd.zip | |
s4-waf: follow the configure directories for the empty install dirs
Thanks to Metze for spotting this
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 | ||||
| -rw-r--r-- | source4/wscript_build | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index c3dd32c97d..0f6a4fe28e 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 788fdba2a5..ff83f93e78 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") |