Revert "sphinx: fix building if sphinx-build is missing"

This reverts commit 1f9c79367e136e0ca5b775562e6111e1a0d0046f.

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 0c016980c3d62886bee5c6506c78b114f40f8a4b..9d1787d8458fe1103bb702f4e222f7b4ae16c637 100644 (file)
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -1304,10 +1304,7 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info
        @touch $@
 
 doc/info/texinfo/libgomp.info: $(SPHINX_FILES)
-       + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
-         make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
-       else true; fi
-
+       + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
 
 # target overrides
 -include $(tmake_file)

diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index f51858db8c707aab83864bd5c620a28cfea26a31..38a7e5bf731444208b7bbf9bb2532e161fa38fc9 100644 (file)
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -1121,10 +1121,7 @@ stamp-geninsrc: doc/info/texinfo/libitm.info
        @touch $@
 
 doc/info/texinfo/libitm.info: $(SPHINX_FILES)
-       + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
-         make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
-       else true; fi
-
+       + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 864ebc6048a44d512d3ba524083df6034f93788a..d551f56ce62250a73386cd4e4cbdde9b75b2acc1 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -1374,9 +1374,7 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
 export BUGURL=$(REPORT_BUGS_TO)
 
 doc/info/texinfo/libquadmath.info: $(SPHINX_FILES)
-       + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
-         make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
-       else true; fi
+       + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the