From a94f7768d9f81d0d997f6ed2df8565e8a1838f2c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 15:10:36 +1100 Subject: [PATCH] build: we don't need the special case for s3build any more Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/samba3.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 9344e55e87e..cb459ad115a 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -50,12 +50,6 @@ def s3_fix_kwargs(bld, kwargs): s3dir = os.path.join(bld.env.srcdir, 'source3') s3reldir = os_path_relpath(s3dir, bld.curdir) - # cope with the fact that the s3 waf rules were originally written - # assuming relative paths to source3/. This only triggers when using the - # wscript rules in s3build/ - if bld.curdir.endswith("/s3build") and not 'subdir' in kwargs: - kwargs['subdir'] = s3reldir - # the extra_includes list is relative to the source3 directory extra_includes = [ '.', 'include', 'lib' ] if bld.env.use_intree_heimdal: