diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 15:10:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:10 +0100 |
| commit | a94f7768d9f81d0d997f6ed2df8565e8a1838f2c (patch) | |
| tree | d701783ec570d21e17677336d8a8a417b0b71dd8 | |
| parent | a3aa71ea3ac23c9ae20d3678fa3f6e1da24ab1b0 (diff) | |
| download | samba-a94f7768d9f81d0d997f6ed2df8565e8a1838f2c.tar.gz samba-a94f7768d9f81d0d997f6ed2df8565e8a1838f2c.tar.bz2 samba-a94f7768d9f81d0d997f6ed2df8565e8a1838f2c.zip | |
build: we don't need the special case for s3build any more
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 9344e55e87..cb459ad115 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: |