gnome: Allow specifying gtkdoc where to install directory

pull/808/head
Thibault Saunier 8 years ago
parent f86fbf6ebf
commit bb3823e6f4
  1. 1
      mesonbuild/modules/gnome.py
  2. 4
      mesonbuild/scripts/gtkdochelper.py

@ -397,6 +397,7 @@ class GnomeModule:
args += self.unpack_args('--fixxrefargs=', 'fixxref_args', kwargs) args += self.unpack_args('--fixxrefargs=', 'fixxref_args', kwargs)
args += self.unpack_args('--html-assets=', 'html_assets', kwargs, state) args += self.unpack_args('--html-assets=', 'html_assets', kwargs, state)
args += self.unpack_args('--content-files=', 'content_files', 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) args += self.get_build_args(kwargs, state)
res = [build.RunTarget(targetname, command[0], command[1:] + args, [], state.subdir)] res = [build.RunTarget(targetname, command[0], command[1:] + args, [], state.subdir)]
if kwargs.get('install', True): if kwargs.get('install', True):

@ -39,6 +39,7 @@ parser.add_argument('--ldflags', dest='ldflags', default='')
parser.add_argument('--cflags', dest='cflags', default='') parser.add_argument('--cflags', dest='cflags', default='')
parser.add_argument('--content-files', dest='content_files', default='') parser.add_argument('--content-files', dest='content_files', default='')
parser.add_argument('--html-assets', dest='html_assets', default='') parser.add_argument('--html-assets', dest='html_assets', default='')
parser.add_argument('--installdir', dest='install_dir')
def gtkdoc_run_check(cmd, cwd): def gtkdoc_run_check(cmd, cwd):
p = subprocess.Popen(cmd, cwd=cwd, p = subprocess.Popen(cmd, cwd=cwd,
@ -174,13 +175,14 @@ def run(args):
options.content_files.split('@@') if options.content_files else []) options.content_files.split('@@') if options.content_files else [])
if 'MESON_INSTALL_PREFIX' in os.environ: if 'MESON_INSTALL_PREFIX' in os.environ:
install_dir = options.install_dir if options.install_dir else options.modulename
destdir = os.environ.get('DESTDIR', '') destdir = os.environ.get('DESTDIR', '')
installdir = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) installdir = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX'])
install_gtkdoc(options.builddir, install_gtkdoc(options.builddir,
options.subdir, options.subdir,
installdir, installdir,
'share/gtk-doc/html', 'share/gtk-doc/html',
options.modulename) install_dir)
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':

Loading…
Cancel
Save