From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 15 Nov 2009 10:05:56 +0000 (+0000)
Subject: Update dodoc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7865d183180a7c1df42bf2dbb7ec428e907da6be;p=thirdparty%2Fgit.git

Update dodoc
---

diff --git a/dodoc.sh b/dodoc.sh
index 5cbc2696b7..7396c043fa 100755
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -71,18 +71,17 @@ do
 	rm -fr doc-$type-inst
 done
 
-case "$(asciidoc --version 2>&1)" in
-asciidoc' 8'.*)
-	ASCIIDOC8=YesPlease
-	export ASCIIDOC8 ;;
-esac
+dd='ASCIIDOC_NO_ROFF=YesPlease
+ASCIIDOC8=YesPlease
+BLK_SHA1=YesPlease
+GNU_ROFF=YesPlease'
 
 make >./:html.log 2>&1 \
-	-C Documentation -j 2 \
+	-C Documentation -j 2 $dd \
 	WEBDOC_DEST="$DOCREPO/doc-html-inst" install-webdoc || exit
 
 make >./:man.log 2>&1 \
-	-C Documentation -j 2 \
+	-C Documentation -j 2 $dd \
 	man1="$DOCREPO/doc-man-inst/man1" \
 	man5="$DOCREPO/doc-man-inst/man5" \
 	man7="$DOCREPO/doc-man-inst/man7" \