From 61d0a8bdffbbb7229776d2f4f2e79ed22d21551f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 1 Jul 2023 00:36:10 +0200 Subject: Merging upstream version 1.5. Signed-off-by: Daniel Baumann --- doc/rst/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/rst/meson.build') diff --git a/doc/rst/meson.build b/doc/rst/meson.build index ea79115..e54c381 100644 --- a/doc/rst/meson.build +++ b/doc/rst/meson.build @@ -1,17 +1,19 @@ +top_source_dir = meson.current_source_dir() + '/../../' + want_docs = get_option('docs') if want_docs != 'false' want_docs_build = get_option('docs-build') rstdir = get_option('rstdir') if want_docs_build - kernel_doc = find_program('../kernel-doc') + kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc') conf = configuration_data() conf.set('SYSCONFDIR', sysconfdir) if want_docs == 'all' or want_docs == 'rst' or want_docs == 'html' foreach apif : api_files - afile = files('../../src/nvme/' + apif) + afile = files(top_source_dir + 'src/nvme/' + apif) subst = configure_file( input: afile, output: '@BASENAME@.subst', -- cgit v1.2.3