The branch, master has been updated via 04fc459... tdb-waf: Don't install binaries when using system tdb. via e6129bd... tdb-waf: Simplify manpage handling. from 1d1d31f... wafsamba: Default blacklist to an empty list rather than None.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 04fc459a301c09d027e2d484b9a4e0737819b093 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon May 31 04:20:44 2010 +0200 tdb-waf: Don't install binaries when using system tdb. commit e6129bd59650b921e51d5b8aa10246778aacdd30 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon May 31 04:16:19 2010 +0200 tdb-waf: Simplify manpage handling. ----------------------------------------------------------------------- Summary of changes: lib/tdb/wscript | 41 ++++++++++++++--------------------------- 1 files changed, 14 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 084be40..6af3897 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -71,22 +71,23 @@ def build(bld): hide_symbols=True, vnum=VERSION, is_bundled=not bld.env.standalone_tdb) - bld.SAMBA_BINARY('tdbtorture', - 'tools/tdbtorture.c', - 'tdb', - install=False) + bld.SAMBA_BINARY('tdbtorture', + 'tools/tdbtorture.c', + 'tdb', + install=False) - bld.SAMBA_BINARY('tdbdump', - 'tools/tdbdump.c', - 'tdb') + bld.SAMBA_BINARY('tdbdump', + 'tools/tdbdump.c', + 'tdb', manpages='manpages/tdbdump.8') - bld.SAMBA_BINARY('tdbbackup', - 'tools/tdbbackup.c', - 'tdb') + bld.SAMBA_BINARY('tdbbackup', + 'tools/tdbbackup.c', + 'tdb', + manpages='manpages/tdbbackup.8') - bld.SAMBA_BINARY('tdbtool', - 'tools/tdbtool.c', - 'tdb') + bld.SAMBA_BINARY('tdbtool', + 'tools/tdbtool.c', + 'tdb', manpages='manpages/tdbtool.8') s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4 @@ -101,20 +102,6 @@ def build(bld): bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) - if bld.env.XSLTPROC: - manpages = 'manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8' - - bld.env.TDB_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' - - for m in manpages.split(): - source = m + '.xml' - bld.SAMBA_GENERATOR(m, - source=source, - target=m, - rule='${XSLTPROC} -o ${TGT} ${TDB_MAN_XSL} ${SRC}' - ) - bld.INSTALL_FILES('${MANDIR}/man8', m, flat=True) - def test(ctx): '''run tdb testsuite''' -- Samba Shared Repository