maintainer-scripts: Fix jit documentation build with update_web_docs_git

scripts/update_web_docs_git -r 9.3.0 -d gcc-9.3.0
failed after the sourceware upgrade, there is no python-sphinx10 package and
python3-sphinx is new enough that the docs build succeeded.

2020-03-12  Jakub Jelinek  <jakub@redhat.com>

	* update_web_docs_git: Drop SPHINXBUILD=/usr/bin/sphinx-1.0-build.

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 4efd47569d438af82e724b930cbf39723f2e5577..0467eba71062050667747d28436c32bbfd1da12f 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-12  Jakub Jelinek  <jakub@redhat.com>
+
+       * update_web_docs_git: Drop SPHINXBUILD=/usr/bin/sphinx-1.0-build.
+
 2020-02-27  Jakub Jelinek  <jakub@redhat.com>
 
        * gcc_release: Add support for -b local-git-repo argument.

diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/update_web_docs_git
index d87a5982f98d0454687ea109a0d2eea178fbe20e..996d29bfb688ab768906440df28847bf4d40bcf3 100755 (executable)
--- a/maintainer-scripts/update_web_docs_git
+++ b/maintainer-scripts/update_web_docs_git
@@ -183,15 +183,16 @@ done
 # defaulting to "sphinx-build".
 #
 # sphinx is packaged in Fedora and EPEL 6 within "python-sphinx",
+# in RHEL 8 within "python3-sphinx",
 # and in openSUSE within "python-Sphinx".
 #
 # For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various
 # directives (e.g. ":c:macro:"), so we need the variant
 # python-sphinx10 package.  The latter installs its executable as
 #   /usr/bin/sphinx-1.0-build
-# so we need to override SPHINXBUILD with this when invoking "make".
+# so we needed to override SPHINXBUILD with this when invoking "make".
 pushd gcc/gcc/jit/docs
-make SPHINXBUILD=/usr/bin/sphinx-1.0-build html || true
+make html || true
 popd
 cp -a gcc/gcc/jit/docs/_build/html jit
 mkdir -p $DOCSDIR/jit