diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2016-09-24 12:05:58 -0300 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2016-09-26 15:25:59 -0300 |
| commit | bb3823e6f4f8332be25d33e07af0d6059f304d51 (patch) | |
| tree | a2af82c0e990ebb42daf045c2216fef5c19eaa33 | |
| parent | f86fbf6ebf68081d2949333ed6bfcda7f768d149 (diff) | |
| download | meson-bb3823e6f4f8332be25d33e07af0d6059f304d51.zip meson-bb3823e6f4f8332be25d33e07af0d6059f304d51.tar.gz meson-bb3823e6f4f8332be25d33e07af0d6059f304d51.tar.bz2 | |
gnome: Allow specifying gtkdoc where to install directory
| -rw-r--r-- | mesonbuild/modules/gnome.py | 1 | ||||
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index cec0c69..11abf88 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -397,6 +397,7 @@ class GnomeModule: args += self.unpack_args('--fixxrefargs=', 'fixxref_args', kwargs) args += self.unpack_args('--html-assets=', 'html_assets', kwargs, state) args += self.unpack_args('--content-files=', 'content_files', kwargs, state) + args += self.unpack_args('--installdir=', 'install_dir', kwargs, state) args += self.get_build_args(kwargs, state) res = [build.RunTarget(targetname, command[0], command[1:] + args, [], state.subdir)] if kwargs.get('install', True): diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 18a7597..e87a379 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -39,6 +39,7 @@ parser.add_argument('--ldflags', dest='ldflags', default='') parser.add_argument('--cflags', dest='cflags', default='') parser.add_argument('--content-files', dest='content_files', default='') parser.add_argument('--html-assets', dest='html_assets', default='') +parser.add_argument('--installdir', dest='install_dir') def gtkdoc_run_check(cmd, cwd): p = subprocess.Popen(cmd, cwd=cwd, @@ -174,13 +175,14 @@ def run(args): options.content_files.split('@@') if options.content_files else []) 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_gtkdoc(options.builddir, options.subdir, installdir, 'share/gtk-doc/html', - options.modulename) + install_dir) return 0 if __name__ == '__main__': |