From 1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 4 Apr 2010 11:00:42 +1000
Subject: s4-waf: avoid having to run waf configure before waf dist

This should be useful for building tarballs from a clean checkout
---
 lib/replace/wscript | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'lib/replace/wscript')

diff --git a/lib/replace/wscript b/lib/replace/wscript
index cc718939e1..db6bc5c450 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -1,13 +1,25 @@
 #!/usr/bin/env python
 
-srcdir = '../..'
+APPNAME = 'libreplace'
+VERSION = '1.2.1'
+
 blddir = 'bin'
 
-import sys
+import sys, os
+
+# find the buildtools directory
+buildtools = 'buildtools ../../buildtools'
+for d in buildtools.split():
+    if os.path.exists(d):
+        srcdir = os.path.dirname(d) or '.'
+        break
+
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba
+import wafsamba, samba_dist
 import Options, os, preproc
 
+samba_dist.DIST_DIRS('lib/replace buildtools:buildtools')
+
 def set_options(opt):
     opt.BUILTIN_DEFAULT('NONE')
     opt.BUNDLED_EXTENSION_DEFAULT('')
-- 
cgit