From: Zbigniew Jędrzejewski-Szmek Date: Mon, 1 May 2017 04:17:20 +0000 (-0400) Subject: meson: fix creation of html symlinks X-Git-Tag: v234~254^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5869%2Fhead;p=thirdparty%2Fsystemd.git meson: fix creation of html symlinks This adds two somewhat independent rules: 1. to create symlinks to html pages in the build directory 2. to create symlinks in the installation directory The second part needs to be coded separately, because telling meson to install the symlinks created in step 1. results in a copy of the target, instead of a symlink. So step 2. needs to ignore the result of 1. and create the symlink again. Fixes #5863. --- diff --git a/man/meson.build b/man/meson.build index 9cdb560c4c1..abe68780228 100644 --- a/man/meson.build +++ b/man/meson.build @@ -64,13 +64,27 @@ foreach tuple : manpages p2 = custom_target( html, input : xml, - output : [html] + htmlaliases, + output : html, command : xslt_cmd + [custom_html_xsl, '@INPUT@'], depend_files : custom_entities_ent, install : want_html, install_dir : join_paths(docdir, 'html')) html_pages += [p2] + foreach htmlalias : htmlaliases + p3 = custom_target( + htmlalias, + input : p2, + output : htmlalias, + command : ['ln', '-fs', html, '@OUTPUT@']) + if want_html + dst = join_paths(docdir, 'html', htmlalias) + cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst) + meson.add_install_script('sh', '-c', cmd) + endif + html_pages += [p3] + endforeach + source_xml_files += files(tuple[0] + '.xml') else message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition))