Pass ASCIIDOC8=YesPlease to Meta/Make and dodoc.sh as needed

diff --git a/DoKernelOrg b/DoKernelOrg
index a03a89162156bc161f572fd66e21bc04e55a9da5..3fbfe5e0642547261d7f063685e8e3735407b415 100755 (executable)
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -17,6 +17,12 @@ make clean >/dev/null 2>&1 &&
 git checkout master &&
 make clean >/dev/null 2>&1 &&
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+       ASCIIDOC8=YesPlease
+       export ASCIIDOC8 ;;
+esac
+
 case "$1" in
 '')
        echo "* Building all"

diff --git a/Make b/Make
index 0d3779f434e701a911621774ad692a44495163d4..39642fd3bf507f48eb15b212a881ab1e1e0e8d51 100755 (executable)
--- a/Make
+++ b/Make
@@ -81,6 +81,12 @@ sh -c 'git describe --abbrev=4 HEAD' >/dev/null 2>&1 || {
        $GIT describe --abbrev=4 HEAD | sed -e 's/-/./g' >version
 }
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+       ASCIIDOC8=YesPlease
+       export ASCIIDOC8 ;;
+esac
+
 CFLAGS="$O $Wall -Wdeclaration-after-statement -g"
 
 make $d \

diff --git a/dodoc.sh b/dodoc.sh
index 20c0c933f8b65fb222dec714c43c06b30dce755e..5cbc2696b7059a1d94e94075c44f3699e69e5f2b 100755 (executable)
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -71,6 +71,12 @@ do
        rm -fr doc-$type-inst
 done
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+       ASCIIDOC8=YesPlease
+       export ASCIIDOC8 ;;
+esac
+
 make >./:html.log 2>&1 \
        -C Documentation -j 2 \
        WEBDOC_DEST="$DOCREPO/doc-html-inst" install-webdoc || exit