diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2020-08-21 15:15:46 +0000 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2020-08-21 15:15:46 +0000 |
commit | d0a6188cfdf5a90962cb334f6c344165be0c5940 (patch) | |
tree | 5ed19e62c6b8a5d802b70177080f6d8e71107cbc | |
parent | 250a21f24365b6fed6271b5f235307d9fbef5eeb (diff) | |
parent | bc2f6aaaeb422e824e14b209a4ed4a2faa794928 (diff) | |
download | gtk-doc-d0a6188cfdf5a90962cb334f6c344165be0c5940.tar.gz |
Merge branch 'wip/smcv/meson' into 'master'
Install the same files with Meson as with Autotools
See merge request GNOME/gtk-doc!48
-rw-r--r-- | buildsystems/autotools/meson.build | 48 | ||||
-rw-r--r-- | help/manual/meson.build | 2 |
2 files changed, 30 insertions, 20 deletions
diff --git a/buildsystems/autotools/meson.build b/buildsystems/autotools/meson.build index c39d3fb..17bbcbd 100644 --- a/buildsystems/autotools/meson.build +++ b/buildsystems/autotools/meson.build @@ -6,20 +6,35 @@ configure_file( install_dir: bindir, ) -custom_target( - 'gtk-doc.flat.make', - input: 'gtk-doc.make', - output: 'gtk-doc.flat.make', - install: true, - install_dir: pkgdatadir, - capture: true, - command: [ - 'sed', - '-e', - 's/EXTRA_DIST =/EXTRA_DIST +=/', - '@INPUT@', - ] -) +foreach mode : ['', 'no-xslt'] + if mode == '' + nested = '' + flat = '.flat' + else + nested = '.' + mode + flat = nested + '-flat' + endif + + custom_target( + 'gtk-doc' + flat + '.make', + input: 'gtk-doc' + nested + '.make', + output: 'gtk-doc' + flat + '.make', + install: true, + install_dir: pkgdatadir, + capture: true, + command: [ + 'sed', + '-e', + 's/EXTRA_DIST =/EXTRA_DIST +=/', + '@INPUT@', + ] + ) + + install_data( + ['gtk-doc' + nested + '.make'], + install_dir: pkgdatadir, + ) +endforeach custom_target( 'gtk-doc.m4', @@ -34,8 +49,3 @@ custom_target( '@OUTPUT@', ], ) - -install_data( - ['gtk-doc.make'], - install_dir: pkgdatadir, -) diff --git a/help/manual/meson.build b/help/manual/meson.build index 6f8ec2c..7e59ab0 100644 --- a/help/manual/meson.build +++ b/help/manual/meson.build @@ -4,6 +4,6 @@ gtkdoc_help_sources = [ ] gnome.yelp( - package_name, + package_name + '-manual', sources: gtkdoc_help_sources, ) |