From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 23 Mar 2020 19:39:23 +0000 (+0100)
Subject: meson: run a no-op build to generate man rules
X-Git-Tag: v246-rc1~685^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3919ecc55358815e2997d7212552251ffd478633;p=thirdparty%2Fsystemd.git

meson: run a no-op build to generate man rules

When a new page is added using man/update-man-rules, ninja doesn't know
about the new target until a build is initiated, so build/man/man and
build/man/html would fail. Force a trivial build to regenerate the rules
before calling 'ninja -t'.
---

diff --git a/man/html.in b/man/html.in
index bc9a668c23f..c09d300d6fc 100755
--- a/man/html.in
+++ b/man/html.in
@@ -6,6 +6,9 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+# make sure the rules have been regenrated (in case man/update-man-rules was just run)
+ninja -C "@BUILD_ROOT@" version.h
+
 target="man/$1.html"
 ninja -C "@BUILD_ROOT@" "$target"
 set -x
diff --git a/man/man.in b/man/man.in
index 75680b860c7..812c6767fcb 100755
--- a/man/man.in
+++ b/man/man.in
@@ -6,6 +6,9 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+# make sure the rules have been regenrated (in case man/update-man-rules was just run)
+ninja -C "@BUILD_ROOT@" version.h
+
 page="$(echo "$1" | sed 's/\./\\./')"
 target=$(ninja -C "@BUILD_ROOT@" -t query man/man | grep -E -m1 "man/$page\.[0-9]$" | awk '{print $2}')
 if [ -z "$target" ]; then