The branch, master has been updated via 2c12559... waf: Fix installation of pidl manapges. from 6da4875... s4 torture: RAW-SEARCH: break out some of the old search levels
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2c125595fb03d1f3940545438bb4ec462585beb7 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 00:00:01 2010 +0200 waf: Fix installation of pidl manapges. ----------------------------------------------------------------------- Summary of changes: Read-Manifest-Now => pidl/blib/man1/.dummy | 0 Read-Manifest-Now => pidl/blib/man3/.dummy | 0 pidl/wscript | 12 +++++------- 3 files changed, 5 insertions(+), 7 deletions(-) copy Read-Manifest-Now => pidl/blib/man1/.dummy (100%) copy Read-Manifest-Now => pidl/blib/man3/.dummy (100%) Changeset truncated at 500 lines: diff --git a/Read-Manifest-Now b/pidl/blib/man1/.dummy similarity index 100% copy from Read-Manifest-Now copy to pidl/blib/man1/.dummy diff --git a/Read-Manifest-Now b/pidl/blib/man3/.dummy similarity index 100% copy from Read-Manifest-Now copy to pidl/blib/man3/.dummy diff --git a/pidl/wscript b/pidl/wscript index 872e238..3137ad0 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -11,14 +11,13 @@ def configure(conf): if conf.CHECK_PERL_MANPAGE(): conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1') conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3') - #conf.DEFINE('HAVE_PERL_MAKEMAKER', 1) + conf.DEFINE('HAVE_PERL_MAKEMAKER', 1) # yapp is used for building the parser conf.find_program('yapp', var='YAPP') -O755 = 493 def build(bld): - bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=O755) + bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=0755) bld.RECURSE('lib') @@ -44,9 +43,8 @@ def build(bld): 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') + 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 @@ -63,5 +61,5 @@ def build(bld): t.env.LINK_COMMAND = link_command for m in pidl_manpages: - dname=os.path.dirname(m)[5:] + dname = os.path.dirname(m)[5:] bld.INSTALL_FILES('${MANDIR}/'+dname, m, flat=True) -- Samba Shared Repository