diff options
| author | Martin Liska <mliska@suse.cz> | 2022-11-13 21:59:03 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-11-14 09:35:05 +0100 |
| commit | b779e6bf0b7cf03a96bc68a31be7d39ca383f645 (patch) | |
| tree | f95ec94e633e9cdbf542fd8206c079e6a7d20c0c /gcc/d | |
| parent | d6e95a12a032defdbbe3b497aef35f7228653d76 (diff) | |
| download | gcc-b779e6bf0b7cf03a96bc68a31be7d39ca383f645.zip gcc-b779e6bf0b7cf03a96bc68a31be7d39ca383f645.tar.gz gcc-b779e6bf0b7cf03a96bc68a31be7d39ca383f645.tar.bz2 | |
Revert "sphinx: add --with-sphinx-build"
This reverts commit 1f5a932e89b0c2c4a7af7f849ca2e2e3dbf329e0.
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/Make-lang.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in index 47bee4c..87178e3 100644 --- a/gcc/d/Make-lang.in +++ b/gcc/d/Make-lang.in @@ -237,15 +237,15 @@ d21$(exeext): $(D_ALL_OBJS) attribs.o $(BACKEND) $(LIBDEPS) $(d.prev) # Documentation. doc/gdc/info/texinfo/gdc.info: $(SPHINX_FILES) - + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ - make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/info SPHINXBUILD=$(SPHINX_BUILD); \ + + if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/info; \ else true; fi doc/gdc.pdf: $(D_TEXI_FILES) $(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< doc/gdc/html/html/index.html: $(SPHINX_FILES) - + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/html SPHINXBUILD=$(SPHINX_BUILD) + + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/html # Build hooks. d.all.cross: gdc-cross$(exeext) @@ -271,7 +271,7 @@ d.srcman: doc/gdc/man/man/gdc.1 -cp -p $^ $(srcdir)/doc doc/gdc/man/man/gdc.1: $(SPHINX_FILES) - + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/man SPHINXBUILD=$(SPHINX_BUILD) + + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/man # 'make check' in gcc/ looks for check-d, as do all toplevel D-related # check targets. However, our DejaGNU framework requires 'check-gdc' as its @@ -304,7 +304,7 @@ d.install-plugin: d.install-info: $(DESTDIR)$(infodir)/gdc.info doc/gdc/pdf/latex/gdc.pdf: $(SPHINX_FILES) - + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/pdf SPHINXBUILD=$(SPHINX_BUILD) + + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/pdf $(DESTDIR)$(infodir)/gdc.info: doc/gdc/info/texinfo/gdc.info installdirs -rm -f $@ |