summaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/hotdochelper.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/scripts/hotdochelper.py b/mesonbuild/scripts/hotdochelper.py
index 2c3b85dc9..80365a035 100644
--- a/mesonbuild/scripts/hotdochelper.py
+++ b/mesonbuild/scripts/hotdochelper.py
@@ -15,14 +15,16 @@ parser.add_argument('--extra-extension-path', action="append", default=[])
parser.add_argument('--name')
parser.add_argument('--builddir')
parser.add_argument('--project-version')
+parser.add_argument('--docdir')
def run(argv: T.List[str]) -> int:
options, args = parser.parse_known_args(argv)
subenv = os.environ.copy()
- for ext_path in options.extra_extension_path:
- subenv['PYTHONPATH'] = subenv.get('PYTHONPATH', '') + ':' + ext_path
+ val = subenv.get('PYTHONPATH')
+ paths = [val] if val else []
+ subenv['PYTHONPATH'] = os.pathsep.join(paths + options.extra_extension_path)
res = subprocess.call(args, cwd=options.builddir, env=subenv)
if res != 0:
@@ -31,9 +33,7 @@ def run(argv: T.List[str]) -> int:
if options.install:
source_dir = os.path.join(options.builddir, options.install)
destdir = os.environ.get('DESTDIR', '')
- installdir = destdir_join(destdir,
- os.path.join(os.environ['MESON_INSTALL_PREFIX'],
- 'share/doc/', options.name, "html"))
+ installdir = destdir_join(destdir, options.docdir)
shutil.rmtree(installdir, ignore_errors=True)
shutil.copytree(source_dir, installdir)