From 40bcff88db2720f16d9ee303431db48e10103e21 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 16 Jan 2015 18:23:56 +0000 Subject: Fix documentation paths for waf 1.8. git-svn-id: http://svn.drobilla.net/autowaf@99 e2e4594f-ea7b-45dc-bc5a-5f5301e603aa --- autowaf.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/autowaf.py b/autowaf.py index a12cfb7..0ffe2d7 100644 --- a/autowaf.py +++ b/autowaf.py @@ -477,12 +477,11 @@ def build_dox(bld, name, version, srcdir, blddir, outdir='', versioned=True): if not bld.env['DOCS']: return + # Doxygen paths in waf 1.8 are relative to the doxygen file, not build directory if is_child(): src_dir = os.path.join(srcdir, name.lower()) - doc_dir = os.path.join(blddir, name.lower(), 'doc') else: src_dir = srcdir - doc_dir = os.path.join(blddir, 'doc') subst_tg = bld(features = 'subst', source = 'doc/reference.doxygen.in', @@ -493,8 +492,8 @@ def build_dox(bld, name, version, srcdir, blddir, outdir='', versioned=True): subst_dict = { name + '_VERSION' : version, name + '_SRCDIR' : os.path.abspath(src_dir), - name + '_DOC_DIR' : os.path.abspath(doc_dir) - } + name + '_DOC_DIR' : '' + } subst_tg.__dict__.update(subst_dict) -- cgit v1.2.1