From 74cf2a1bda9bcd8db9201f0cc0a69f5ec05ecf82 Mon Sep 17 00:00:00 2001 From: Aliaksei Karaliou Date: Tue, 29 Jan 2019 08:45:26 -0500 Subject: [PATCH] build:docs: Get rid of hardcoded 'bin/default' Build scripts for documentation still contain hardcoded path to build destination rather than use proper final build path variables. Signed-off-by: Aliaksei Karaliou Reviewed-by: Alexander Bokovoy Reviewed-by: David Mulder Reviewed-by: Andreas Schneider --- buildtools/wafsamba/wafsamba.py | 2 +- wscript_build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index a077026c690..9d8251d60bf 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -920,7 +920,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None): '''build and install manual pages''' bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl' bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl' - bld.env.SAMBA_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' + bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml' bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG for m in manpages.split(): diff --git a/wscript_build b/wscript_build index d59aca8e1b8..a72094838d4 100644 --- a/wscript_build +++ b/wscript_build @@ -29,7 +29,7 @@ bld.SAMBA_MKVERSION('version.h') # bld.ENABLE_MAGIC_ORDERING() bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml' -bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml' +bld.env.ABS_TOP_BUILDDIR = bld.bldnode.abspath() + '/docs-xml' bld.CONFIGURE_FILE('docs-xml/build/catalog.xml', ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR, ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR) -- 2.34.1