From: Jordan Petridis <jpetridis@gnome.org>
Date: Thu, 13 Mar 2025 14:17:45 +0000 (+0200)
Subject: meson: Check for lxml before generating indicies
X-Git-Tag: v258-rc1~1070
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8285c97b97332a4815d4b90356120ef55a51f6a5;p=thirdparty%2Fsystemd.git

meson: Check for lxml before generating indicies

Followup to c0cc01de8a0249fb80684c861e50c939aa67d91e

The targets that create indicies have
`install : want_html and have_lxml` but some other
code like the `install_symlink` was not gated by
accident.

We ican put the whole loop behind have_lxml as its
required for all the indicies.
---

diff --git a/man/meson.build b/man/meson.build
index 6b33c607577..90c6fef4d6c 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -136,8 +136,8 @@ systemd_index_xml = custom_target(
         output : 'systemd.index.xml',
         command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
 
-foreach tuple : xsltproc.found() ? [['systemd.directives', '7', systemd_directives_xml],
-                                    ['systemd.index',      '7', systemd_index_xml]] : []
+foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', systemd_directives_xml],
+                                                  ['systemd.index',      '7', systemd_index_xml]] : []
         stem = tuple[0]
         section = tuple[1]
         xml = tuple[2]
@@ -152,7 +152,7 @@ foreach tuple : xsltproc.found() ? [['systemd.directives', '7', systemd_directiv
                 input : xml,
                 output : man,
                 command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
-                install : want_man and have_lxml,
+                install : want_man,
                 install_dir : mandirn)
         man_pages += p1
 
@@ -179,7 +179,7 @@ foreach tuple : xsltproc.found() ? [['systemd.directives', '7', systemd_directiv
                 output : html,
                 command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
                 depends : [man_page_depends, p2],
-                install : want_html and have_lxml,
+                install : want_html,
                 install_dir : docdir / 'html')
         html_pages += p3
 endforeach