From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Apr 2017 23:44:41 +0000 (-0400)
Subject: meson: add rule to generate custom-entities.ent
X-Git-Tag: v234~286^2~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04e3eb46e316dacc990bed1e520df44327bbf5c1;p=thirdparty%2Fsystemd.git

meson: add rule to generate custom-entities.ent

This is a bit bare-bones, but should work for now. Maybe in the future we'll
have a way to make meson generate it for us, without specifying all the names
by hand.
---

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
new file mode 100644
index 00000000000..0257c2a94f2
--- /dev/null
+++ b/man/custom-entities.ent.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!ENTITY MOUNT_PATH @MOUNT_PATH@>
+<!ENTITY UMOUNT_PATH @UMOUNT_PATH@>
+<!ENTITY systemgeneratordir @SYSTEM_GENERATOR_PATH@>
+<!ENTITY usergeneratordir @USER_GENERATOR_PATH@>
+<!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@>
+<!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@>
diff --git a/man/meson.build b/man/meson.build
index 0f0bbd6ffc9..c78c24d3e60 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -20,7 +20,11 @@ xsltproc_flags = [
 
 custom_man_xsl = files('custom-man.xsl')
 custom_html_xsl = files('custom-man.xsl')
-custom_entities_ent = files('custom-entities.ent')
+
+custom_entities_ent = configure_file(
+    input : 'custom-entities.ent.in',
+    output : 'custom-entities.ent',
+    configuration : conf)
 
 foreach tuple : manpages
   stem = tuple[0]
@@ -48,6 +52,7 @@ foreach tuple : manpages
       input : xml,
       output : [man] + manaliases,
       command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'],
+      depend_files : custom_entities_ent,
       install : install,
       install_dir : mandirn)
 
@@ -55,7 +60,8 @@ foreach tuple : manpages
       html,
       input : xml,
       output : [html] + htmlaliases,
-      command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'])
+      command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'],
+      depend_files : custom_entities_ent)
 
   if not install
     message('Skipping @0@.@1@ because @2@ is @3@'.format(stem, section, condition, install))