diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9434bd93c6..c96f3eee64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -477,7 +477,7 @@ stages:
stage: docs
script:
- *configure
- - meson compile -C build arm man
+ - meson compile -C build arm arm-epub man
- find build/man/ -maxdepth 2 -name "*.[0-9]" -exec mandoc -T lint "{}" \; | ( ! grep -v -e "skipping paragraph macro. sp after" -e "unknown font, skipping request. ft C" -e "input text line longer than 80 bytes" )
- test -z "${DOC_CHECK_MISC_CHANGE}" || ninja -C build doc-misc
- test -z "${DOC_CHECK_MISC_CHANGE}" || cp build/doc/misc/options build/doc/misc/rndc.grammar build/doc/misc/*.zoneopt doc/misc/
@@ -1361,12 +1361,12 @@ release:
# Prepare release tarball contents (tarballs + documentation)
- mkdir -p "${BIND_DIRECTORY}-release/doc/arm"
- pushd "${BIND_DIRECTORY}-release"
- - mv "../${BIND_DIRECTORY}.tar.xz" .
+ - mv "../build/meson-dist/${BIND_DIRECTORY}.tar.xz" .
- tar --extract --file="${BIND_DIRECTORY}.tar.xz"
- mv "${BIND_DIRECTORY}"/{COPYRIGHT,LICENSE,README.md,srcid} .
- rm -rf "${BIND_DIRECTORY}"
- - mv "../doc/arm/_build/html" doc/arm/
- - mv "../doc/arm/_build/epub/Bv9ARM.epub" doc/arm/
+ - mv ../build/arm/ doc/arm/html/
+ - mv ../build/arm-epub/Bv9ARM.epub doc/arm/
- echo 'Redirect' > "RELEASE-NOTES-${BIND_DIRECTORY}.html"
- echo 'Redirect' > "CHANGELOG-${BIND_DIRECTORY}.html"
- popd
diff --git a/meson.build b/meson.build
index 0168c071ca..1e91c119e6 100644
--- a/meson.build
+++ b/meson.build
@@ -121,11 +121,11 @@ sbindir = prefix / get_option('sbindir')
sysconfdir = prefix / get_option('sysconfdir')
src_id = ''
-if fs.is_file('.source-id')
- src_id = fs.read('.source-id', encoding: 'utf-8').strip()
+if fs.is_file('srcid')
+ src_id = fs.read('srcid', encoding: 'utf-8').strip()
elif git.found()
src_id = run_command(git, 'rev-parse', '--short', 'HEAD', check: true).stdout().substring(0, 7)
- meson.add_dist_script('util' / 'meson-dist-package.sh', 'source-id', src_id)
+ meson.add_dist_script('util' / 'meson-dist-package.sh', 'srcid', src_id)
endif
### Compiler
diff --git a/util/meson-dist-package.sh b/util/meson-dist-package.sh
index ec1d76c4df..7a60e18c75 100644
--- a/util/meson-dist-package.sh
+++ b/util/meson-dist-package.sh
@@ -61,8 +61,8 @@ generate_man_pages() {
}
case $1 in
- "source-id")
- echo $2 >$MESON_DIST_ROOT/.source-id
+ "srcid")
+ echo $2 >$MESON_DIST_ROOT/srcid
;;
"manual")
generate_man_pages $2 $3