1 files changed, 11 insertions, 2 deletions

diff --git a/meson-dist-script b/meson-dist-script
index e5e9287dc..5d5cf9942 100644
--- a/meson-dist-script
+++ b/meson-dist-script
@@ -2,5 +2,14 @@
 
 set -eu
 
-cd "${MESON_DIST_ROOT}"
-. ./scripts/sphinx_update.sh
+HANDBOOK_BOOTSTRAP=${MESON_SOURCE_ROOT}/contrib/handbook/_build
+
+if [ ! -d ${HANDBOOK_BOOTSTRAP}/html ] || [ ! -d ${HANDBOOK_BOOTSTRAP}/texinfo ]
+then
+  echo "Handbook not found, did you run bootstrap? Trying to compile now..."
+  cd "${MESON_DIST_ROOT}"
+  . ./scripts/sphinx_update.sh || exit 1
+else
+  cp -r ${HANDBOOK_BOOTSTRAP}/html ${MESON_DIST_ROOT}/handbook/ || exit 1
+  cp -r ${HANDBOOK_BOOTSTRAP}/texinfo ${MESON_DIST_ROOT}/handbook/ || exit 1
+fi