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

This reverts commit 1f9c79367e.
This commit is contained in:
Martin Liska 2022-11-13 21:58:22 +01:00
parent 3c1d0356cf
commit 50b2e0fc36
3 changed files with 3 additions and 11 deletions

View File

@ -1304,10 +1304,7 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info
@touch $@ @touch $@
doc/info/texinfo/libgomp.info: $(SPHINX_FILES) 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)
make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
else true; fi
# target overrides # target overrides
-include $(tmake_file) -include $(tmake_file)

View File

@ -1121,10 +1121,7 @@ stamp-geninsrc: doc/info/texinfo/libitm.info
@touch $@ @touch $@
doc/info/texinfo/libitm.info: $(SPHINX_FILES) 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)
make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
else true; fi
# GNU Make needs to see an explicit $(MAKE) variable in the command it # GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the # runs to enable its job server during parallel builds. Hence the

View File

@ -1374,9 +1374,7 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
export BUGURL=$(REPORT_BUGS_TO) export BUGURL=$(REPORT_BUGS_TO)
doc/info/texinfo/libquadmath.info: $(SPHINX_FILES) 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)
make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
else true; fi
# GNU Make needs to see an explicit $(MAKE) variable in the command it # GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the # runs to enable its job server during parallel builds. Hence the