diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2016-06-16 23:13:23 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-16 20:43:23 +0300 |
| commit | b2fb4f9d6634adb1e51d7d92075a548de9229ce5 (patch) | |
| tree | db8d6bcad51ca1aaf534f25cffa8eaee074d069b /mesonbuild/scripts/gtkdochelper.py | |
| parent | 217e0593ca3ad42aebdb5decfe3649abea45b957 (diff) | |
| download | meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.zip meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.tar.gz meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.tar.bz2 | |
scripts: Use destdir_join fix for all DESTDIR prefixing (#598)
Diffstat (limited to 'mesonbuild/scripts/gtkdochelper.py')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index d920b61..cc06f7b 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -17,6 +17,7 @@ import sys, os import subprocess import shutil import argparse +from mesonbuild.scripts import destdir_join parser = argparse.ArgumentParser() @@ -113,10 +114,8 @@ def run(args): fixxrefargs) if 'MESON_INSTALL_PREFIX' in os.environ: - if 'DESTDIR' in os.environ: - installdir = os.environ['DESTDIR'] + os.environ['MESON_INSTALL_PREFIX'] - else: - installdir = os.environ['MESON_INSTALL_PREFIX'] + destdir = os.environ.get('DESTDIR', '') + installdir = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) install_gtkdoc(options.builddir, options.subdir, installdir, |