Merge changes Iedf46484,I76b51eac,I6a084827,I60193f9f into main

* changes:
  meson: fix log-dir
  manual: build docs with dummy envs
  libcmd: install generated headers as well
  docs: redo content generation for mdbook and manual

2 files changed, 8 insertions, 1 deletions

diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index b057daa37..6b1b44d84 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -58,6 +58,13 @@ libcmd = library(
 )
 
 install_headers(libcmd_headers, subdir : 'nix', preserve_path : true)
+custom_target(
+  command : [ 'cp', '@INPUT@', '@OUTPUT@' ],
+  input : libcmd_generated_headers,
+  output : '@PLAINNAME@',
+  install : true,
+  install_dir : includedir / 'nix',
+)
 
 liblixcmd = declare_dependency(
   include_directories : '.',
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 01e1239b3..fb433c607 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -436,7 +436,7 @@ struct ExperimentalFeatureSettings : Config {
 
           The following experimental features are available:
 
-          {{#include experimental-features-shortlist.md}}
+          {{#include @generated@/command-ref/experimental-features-shortlist.md}}
 
           Experimental features are [further documented in the manual](@docroot@/contributing/experimental-features.md).
         )"};