diff --git a/doc/devel/make-devel.sh.in b/doc/devel/make-devel.sh.in
index 2605431d00..b51d9daee6 100755
--- a/doc/devel/make-devel.sh.in
+++ b/doc/devel/make-devel.sh.in
@@ -1,11 +1,8 @@
 #!/bin/sh
 
-set -euv
+set -eu
 
-cd '@TOP_SOURCE_DIR@'
+cd '@srcdir@'
 
-(cat '@srcdir@/Doxyfile'; echo PROJECT_NUMBER=@PACKAGE_VERSION@) | doxygen - > '@builddir@/html/doxygen.log' 2> '@builddir@/html/doxygen-error.log'
-echo "$(grep -c ': warning:' '@builddir@/html/doxygen-error.log')" warnings/errors detected.
-
-rm -fr '@builddir@/html'
-mv '@srcdir@/html' '@builddir@/html'
+(cat Doxyfile; echo OUTPUT_DIRECTORY = @builddir@/html; echo PROJECT_NUMBER = @PACKAGE_VERSION@) | doxygen - > '@builddir@/doxygen.log' 2> '@builddir@/doxygen-error.log'
+echo "$(grep -c ': warning:' '@builddir@/doxygen-error.log')" warnings/errors detected.
diff --git a/doc/make-grammar.sh.in b/doc/make-grammar.sh.in
index 94a76bdd2e..b0108d3742 100755
--- a/doc/make-grammar.sh.in
+++ b/doc/make-grammar.sh.in
@@ -3,7 +3,7 @@
 # Expressions don't expand in single quotes, use double quotes for that. [SC2016]
 # shellcheck disable=SC2016
 
-set -euv
+set -eu
 
 cd '@TOP_SOURCE_DIR@'