diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 17:34:51 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:00 +1100 |
| commit | 479a4235e370325167d1085c11698f768f6b51fc (patch) | |
| tree | 62875756f525cf22b984ea2353ab3744e6c891a8 | |
| parent | b038aca5c869ba98f123f7107c3a6906c5f6bbdd (diff) | |
| download | samba-479a4235e370325167d1085c11698f768f6b51fc.tar.gz samba-479a4235e370325167d1085c11698f768f6b51fc.tar.bz2 samba-479a4235e370325167d1085c11698f768f6b51fc.zip | |
s4-dynconfig: fixed dyn_SETUPDIR to point to the right directory
this make dyn_SETUPDIR correct for both source4/ build and a top level
build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dynconfig/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 0058047182..ca664fbe6e 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -124,8 +124,8 @@ def dynconfig_cflags(bld, list=None): cflags = [] # override some paths when running from the build directory override = { 'MODULESDIR' : 'bin/modules', - 'SCRIPTSBINDIR' : 'scripting/bin', - 'SETUPDIR' : 'setup' } + 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'), + 'SETUPDIR' : os.path.join(bld.env.srcdir, 'source4/setup') } for f in dyn_cflags.keys(): if list and not f in list: continue |