diff options
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 | ||||
| -rw-r--r-- | pidl/wscript | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 63d657f370..8dfa003091 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -51,8 +51,6 @@ def SAMBA_BUILD_ENV(conf): os.unlink(blib_src) elif os.path.exists(blib_src): shutil.rmtree(blib_src) - os.symlink(blib_bld, blib_src) - def ADD_INIT_FUNCTION(bld, subsystem, target, init_function): diff --git a/pidl/wscript b/pidl/wscript index 4db7ca54d9..2a0a434964 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -39,10 +39,15 @@ def build(bld): # use perl to build the manpages bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl') - bld.SAMBA_GENERATOR('pidl_manpages', - source=pidl_src, - target=pidl_manpages, - rule='cd ${pidl_srcdir} && ${PERL} Makefile.PL && make manifypods && rm -f Makefile Makefile.old') + blib_bld = os.path.join(bld.srcnode.abspath(bld.env), 'pidl/blib') + + link_command = 'rm -rf blib && ln -s %s' % blib_bld + + t = bld.SAMBA_GENERATOR('pidl_manpages', + source=pidl_src, + target=pidl_manpages, + rule='cd ${pidl_srcdir} && ${LINK_COMMAND} && ${PERL} Makefile.PL && make manifypods && rm -f Makefile Makefile.old && rm -f blib') + t.env.LINK_COMMAND = link_command # we want to prefer the git version of the parsers if we can. Only if the # source has changed do we want to re-run yapp @@ -51,10 +56,11 @@ def build(bld): bld.IS_NEWER('expr.yp', 'lib/Parse/Pidl/Expr.pm'))) if need_yapp_build: - bld.SAMBA_GENERATOR('pidl_parser', - source='idl.yp expr.yp', - target='lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm Makefile.PL', - rule='cd ${pidl_srcdir} && ${PERL} Makefile.PL && make lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm && rm -f Makefile Makefile.old') + t = bld.SAMBA_GENERATOR('pidl_parser', + source='idl.yp expr.yp', + target='lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm Makefile.PL', + rule='cd ${pidl_srcdir} && ${LINK_COMMAND} && ${PERL} Makefile.PL && make lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm && rm -f Makefile Makefile.old && rm -f blib') + t.env.LINK_COMMAND = link_command for m in pidl_manpages: dname=os.path.dirname(m)[5:] |