diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-17 12:40:09 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-17 12:40:41 +0530 |
| commit | 04ac7a48447b884544d160ebee824ad571408c79 (patch) | |
| tree | d3e0ce56e6b8a56e6cacf1ce2458a6b56dc66e1b /mesonbuild/scripts/gtkdochelper.py | |
| parent | f77c3176ab5cb583fc32bfdebeb320481b7d3592 (diff) | |
| download | meson-04ac7a48447b884544d160ebee824ad571408c79.zip meson-04ac7a48447b884544d160ebee824ad571408c79.tar.gz meson-04ac7a48447b884544d160ebee824ad571408c79.tar.bz2 | |
gnome.gtkdoc: Handle absolute install_dirs correctly
Must prepend DESTDIR in case it's absolute. Also document that by
default it is relative to the gtk-doc html directory.
Diffstat (limited to 'mesonbuild/scripts/gtkdochelper.py')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index a2cbf5a..45ed96b 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -218,12 +218,14 @@ def run(args): options.mode) if 'MESON_INSTALL_PREFIX' in os.environ: - install_dir = options.install_dir if options.install_dir else options.modulename destdir = os.environ.get('DESTDIR', '') - installdir = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) + install_prefix = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) + install_dir = options.install_dir if options.install_dir else options.modulename + if os.path.isabs(install_dir): + install_dir = destdir_join(destdir, install_dir) install_gtkdoc(options.builddir, options.subdir, - installdir, + install_prefix, 'share/gtk-doc/html', install_dir) return 0 |