From 50b2e0fc3604e9f69a5e3b6ad1902e681764edc5 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Sun, 13 Nov 2022 21:58:22 +0100
Subject: [PATCH] Revert "sphinx: fix building if sphinx-build is missing"

This reverts commit 1f9c79367e136e0ca5b775562e6111e1a0d0046f.
---
 libgomp/Makefile.in     | 5 +----
 libitm/Makefile.in      | 5 +----
 libquadmath/Makefile.in | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 0c016980c3d6..9d1787d8458f 100644
--- 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 f51858db8c70..38a7e5bf7314 100644
--- 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 864ebc6048a4..d551f56ce622 100644
--- 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
-- 
GitLab