diff options
| author | Olivia Crain <olivia@olivia.dev> | 2024-09-28 23:41:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-09-28 23:41:30 +0000 |
| commit | f12b60273b7e93184dd175ef9daa75ec490cbd5e (patch) | |
| tree | df00ff248ad0d1dc0ce8ebb3a4cde445cefb0d99 /doc | |
| parent | ae5d8dae1b796967c40b1f22b844d07f5697033e (diff) | |
| parent | b86863d93565a05b7695e3579caa2fe2ab62f3a1 (diff) | |
Merge changes I5c640824,I09ffc92e,I259583b7 into main
* changes:
build: require meson 1.4.0 or newer
build: fix deprecated uses of configure_file
build: install html manual without using install_subdir
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/meson.build | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/manual/meson.build b/doc/manual/meson.build index f53d41b5d..38aad55b5 100644 --- a/doc/manual/meson.build +++ b/doc/manual/meson.build @@ -126,20 +126,18 @@ manual = custom_target( 'manual', 'markdown', ], + install_dir : [ + datadir / 'doc/nix', + false, + ], depfile : 'manual.d', env : { 'RUST_LOG': 'info', 'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'src', }, ) -manual_html = manual[0] manual_md = manual[1] -install_subdir( - manual_html.full_path(), - install_dir : datadir / 'doc/nix', -) - nix_nested_manpages = [ [ 'nix-env', [ |