From 7d8f8fd807621ddbe823c7422937203e7068c933 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Thu, 27 Feb 2025 10:39:24 +0200 Subject: [PATCH] [#3731] Fix grammar target in Meson --- doc/make-grammar.sh.in | 12 +++++++----- doc/meson.build | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/make-grammar.sh.in b/doc/make-grammar.sh.in index 9f5530c4b1..ea17aef7be 100755 --- a/doc/make-grammar.sh.in +++ b/doc/make-grammar.sh.in @@ -7,15 +7,17 @@ set -euv cd @TOP_SOURCE_DIR@ +extract_bnf="@TOP_BUILD_DIR@/tools/extract_bnf.sh" + mkdir -p doc/sphinx/grammar -./tools/extract_bnf.sh src/bin/dhcp4/dhcp4_parser \ +"${extract_bnf}" src/bin/dhcp4/dhcp4_parser \ --markdown ':ref:`dhcp4`' > doc/sphinx/grammar/grammar-dhcp4-parser.rst -./tools/extract_bnf.sh src/bin/dhcp6/dhcp6_parser \ +"${extract_bnf}" src/bin/dhcp6/dhcp6_parser \ --markdown ':ref:`dhcp6`' > doc/sphinx/grammar/grammar-dhcp6-parser.rst -./tools/extract_bnf.sh src/bin/d2/d2_parser \ +"${extract_bnf}" src/bin/d2/d2_parser \ --markdown ':ref:`dhcp-ddns-server`' > doc/sphinx/grammar/grammar-d2-parser.rst -./tools/extract_bnf.sh src/bin/agent/agent_parser \ +"${extract_bnf}" src/bin/agent/agent_parser \ --markdown ':ref:`kea-ctrl-agent`' > doc/sphinx/grammar/grammar-ca-parser.rst -./tools/extract_bnf.sh src/bin/netconf/netconf_parser \ +"${extract_bnf}" src/bin/netconf/netconf_parser \ --markdown ':ref:`netconf`' > doc/sphinx/grammar/grammar-netconf-parser.rst diff --git a/doc/meson.build b/doc/meson.build index 419a571649..e2f333fa87 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -94,6 +94,9 @@ install_data(examples, preserve_path: true, install_dir: 'share/doc/kea') make_grammar = configure_file( input: 'make-grammar.sh.in', output: 'make-grammar.sh', - configuration: {'TOP_SOURCE_DIR': TOP_SOURCE_DIR}, + configuration: { + 'TOP_BUILD_DIR': TOP_BUILD_DIR, + 'TOP_SOURCE_DIR': TOP_SOURCE_DIR, + }, ) run_target('grammar', command: [make_grammar])