From 733aea272f1808d79a86cba5d89aa31b2ff64873 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 26 Sep 2013 15:05:26 -0500 Subject: [PATCH] wscript: remove old cruft, fix manpage generation --- wscript | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/wscript b/wscript index a02171d6..71948efd 100644 --- a/wscript +++ b/wscript @@ -182,13 +182,6 @@ def build(bld): bld.recurse('tests') """ - # create the aubio.pc file for pkg-config - if ctx.env['TARGET_PLATFORM'] == 'linux': - aubiopc = ctx.new_task_gen('subst') - aubiopc.source = 'aubio.pc.in' - aubiopc.target = 'aubio.pc' - aubiopc.install_path = '${PREFIX}/lib/pkgconfig' - # install woodblock sound bld.install_files('${PREFIX}/share/sounds/aubio/', 'sounds/woodblock.aiff') @@ -199,17 +192,17 @@ def build(bld): # build manpages from sgml files if bld.env['DOCBOOKTOMAN']: from waflib import TaskGen + if 'MANDIR' not in bld.env: + bld.env['MANDIR'] = bld.env['PREFIX'] + '/share/man' TaskGen.declare_chain( - name = 'docbooktoman', - rule = '${DOCBOOKTOMAN} ${SRC} > ${TGT}', - ext_in = '.sgml', - ext_out = '.1', - reentrant = 0, + name = 'docbooktoman', + rule = '${DOCBOOKTOMAN} ${SRC} > ${TGT}', + ext_in = '.sgml', + ext_out = '.1', + reentrant = False, + install_path = '${MANDIR}/man1', ) - manpages = bld(name = 'docbooktoman', - source=bld.path.ant_glob('doc/*.sgml')) - bld.install_files('${MANDIR}/man1', - bld.path.ant_glob('doc/*.1')) + bld( source = bld.path.ant_glob('doc/*.sgml') ) def shutdown(bld): from waflib import Options, Logs -- 2.11.0