summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-03 22:46:32 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:24 +1000
commit7aa3f08f851aef234cb236b11c653f904c9e622a (patch)
tree39d1bda487b96c5c0b20440708a23b0436458d05 /buildtools
parentfeafcd2fb452e6ac92aa2f8d60138cbec9a48083 (diff)
downloadsamba-7aa3f08f851aef234cb236b11c653f904c9e622a.tar.gz
samba-7aa3f08f851aef234cb236b11c653f904c9e622a.tar.bz2
samba-7aa3f08f851aef234cb236b11c653f904c9e622a.zip
build: fixed DESTDIR for TOUCH_FILE()
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_utils.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 5637a305d0..07a37aa9e7 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -408,8 +408,13 @@ def IS_NEWER(bld, file1, file2):
Build.BuildContext.IS_NEWER = IS_NEWER
-def TOUCH_FILE(file):
+def TOUCH_FILE(file, install_dir=False):
'''touch a file'''
+ if install_dir:
+ if file[0] == '/':
+ file = Options.options.destdir + file
+ else:
+ file = Options.options.destdir + '/' + file
mkdir_p(os.path.dirname(file))
f = open(file, 'w')
f.close()