From 64594f296ca84c487e5cd7ec5e76153cb3b3ef4a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 5 Apr 2010 11:25:20 +1000 Subject: s4-waf: replace TOUCH_FILE() with normal install rules this allows it to work with 'waf uninstall' --- lib/wscript_build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/wscript_build') diff --git a/lib/wscript_build b/lib/wscript_build index 44bf8108c8..f6fbe7a880 100644 --- a/lib/wscript_build +++ b/lib/wscript_build @@ -21,7 +21,8 @@ for e in list: bld.INSTALL_WILDCARD('${PYTHONDIR}/samba/external', e + '/**/*', flat=False, exclude='*.pyc', trim_path=os.path.dirname(e)) -if Options.is_install: - # we need a blank __init__.py in samba/external - TOUCH_FILE(bld.EXPAND_VARIABLES('${PYTHONDIR}/samba/external/__init__.py'), - install_dir=True) +bld.SAMBA_GENERATOR('external_init_py', + rule='touch ${TGT}', + target='empty_file') + +bld.INSTALL_FILES('${PYTHONDIR}/samba/external', 'empty_file', destname='__init__.py') -- cgit