Revert "sphinx: support installation if sphinx-build is missing"

This reverts commit e5821d3f62b5bf532db1be661459b7553a956fa2.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 838c5ad906ad2bc0c1540039e473018d479cc3d6..aea62228552b0d966287fc262090021c14723093 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3686,32 +3686,42 @@ install-info:: doc installdirs \
        $(DESTDIR)$(infodir)/gccint.info \
        lang.install-info
 
-$(DESTDIR)$(infodir)/gcc.info: installdirs
-       -if [ -f doc/gcc/info/texinfo/gcc.info ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/info/texinfo/gcc.info $@; fi
+$(DESTDIR)$(infodir)/gcc.info: doc/gcc/info/texinfo/gcc.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/gccint.info: installdirs
-       -if [ -f doc/gccint/info/texinfo/gccint.info ]; then rm -f $@; $(INSTALL_DATA) doc/gccint/info/texinfo/gccint.info $@; fi
+$(DESTDIR)$(infodir)/gccint.info: doc/gccint/info/texinfo/gccint.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/install.info: installdirs
-       -if [ -f doc/install/info/texinfo/install.info ]; then rm -f $@; $(INSTALL_DATA) doc/install/info/texinfo/install.info $@; fi
+$(DESTDIR)$(infodir)/install.info: doc/install/info/texinfo/install.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/cpp.info: installdirs
-       -if [ -f doc/cpp/info/texinfo/cpp.info ]; then rm -f $@; $(INSTALL_DATA) doc/cpp/info/texinfo/cpp.info $@; fi
+$(DESTDIR)$(infodir)/cpp.info: doc/cpp/info/texinfo/cpp.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/cppinternals.info: installdirs
-       -if [ -f doc/cppinternals/info/texinfo/cppinternals.info ]; then rm -f $@; $(INSTALL_DATA) doc/cppinternals/info/texinfo/cppinternals.info $@; fi
+$(DESTDIR)$(infodir)/cppinternals.info: doc/cppinternals/info/texinfo/cppinternals.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/gcov.info: installdirs
-       -if [ -f doc/gcc/info/texinfo/gcov.info ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/info/texinfo/gcov.info $@; fi
+$(DESTDIR)$(infodir)/gcov.info: doc/gcc/info/texinfo/gcov.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/gcov-tool.info: installdirs
-       -if [ -f doc/gcc/info/texinfo/gcov-tool.info ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/info/texinfo/gcov-tool.info $@; fi
+$(DESTDIR)$(infodir)/gcov-tool.info: doc/gcc/info/texinfo/gcov-tool.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/gcov-dump.info: installdirs
-       -if [ -f doc/gcc/info/texinfo/gcov-dump.info ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/info/texinfo/gcov-dump.info $@; fi
+$(DESTDIR)$(infodir)/gcov-dump.info: doc/gcc/info/texinfo/gcov-dump.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/lto-dump.info: doc/gcc/info/texinfo/lto-dump.info installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
-$(DESTDIR)$(infodir)/lto-dump.info: installdirs
-       -if [ -f doc/gcc/info/texinfo/lto-dump.info ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/info/texinfo/lto-dump.info $@; fi
 
 dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 
@@ -3773,32 +3783,50 @@ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 installdirs
        -$(INSTALL_DATA) $< $@
        -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext):  installdirs
-       -if [ -f doc/gcc/man/man/gcc.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gcc.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc/man/man/gcc.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext):  installdirs
-       -if [ -f doc/gcc/man/man/cpp.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/cpp.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext): doc/cpp/man/man/cpp.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/gcc/man/man/gcov.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gcov.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): doc/gcc/man/man/gcov.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(GCOV_TOOL_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/gcc/man/man/gcov-tool.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gcov-tool.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GCOV_TOOL_INSTALL_NAME)$(man1ext): doc/gcc/man/man/gcov-tool.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(GCOV_DUMP_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/gcc/man/man/gcov-dump.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gcov-dump.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GCOV_DUMP_INSTALL_NAME)$(man1ext): doc/gcc/man/man/gcov-dump.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(LTO_DUMP_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/gcc/man/man/lto-dump.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/lto-dump.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(LTO_DUMP_INSTALL_NAME)$(man1ext): doc/gcc/man/man/lto-dump.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man7dir)/fsf-funding$(man7ext): installdirs
-       -if [ -f doc/gcc/man/man/fsf-funding.7 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/fsf-funding.7 $@; chmod a-x $@; fi
+$(DESTDIR)$(man7dir)/fsf-funding$(man7ext): doc/gcc/man/man/fsf-funding.7 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man7dir)/gfdl$(man7ext): installdirs
-       -if [ -f doc/gcc/man/man/gfdl.7 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gfdl.7 $@; chmod a-x $@; fi
+$(DESTDIR)$(man7dir)/gfdl$(man7ext): doc/gcc/man/man/gfdl.7 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
-$(DESTDIR)$(man7dir)/gpl$(man7ext): installdirs
-       -if [ -f doc/gcc/man/man/gpl.7 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gpl.7 $@; chmod a-x $@; fi
+$(DESTDIR)$(man7dir)/gpl$(man7ext): doc/gcc/man/man/gpl.7 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 # Install all the header files built in the include subdirectory.
 install-headers: $(INSTALL_HEADERS_DIR)

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index c404bef807fe0b3601bc53c6329693e366ca6896..555d2ef24c1ef16c4a0f9e504e7d09b216ee3175 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -837,13 +837,16 @@ ada.install-info: $(DESTDIR)$(infodir)/gnat_ugn.info \
        $(DESTDIR)$(infodir)/gnat-style.info
 
 $(DESTDIR)$(infodir)/gnat_ugn.info: doc/gnat_ugn/info/texinfo/gnat_ugn.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 $(DESTDIR)$(infodir)/gnat_rm.info: doc/gnat_rm/info/texinfo/gnat_rm.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 $(DESTDIR)$(infodir)/gnat-style.info: doc/gnat-style/info/texinfo/gnat-style.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 ADA_PDFFILES = doc/gnat_ugn/pdf/latex/gnat_ugn.pdf\
               doc/gnat_rm/pdf/latex/gnat_rm.pdf \

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 57b89e2fdf988caab2785a4d1786c53544fe87ad..f8fa4d171eabc7a164cf7f4628990f165948434a 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -285,13 +285,15 @@ c++.install-common: installdirs
 
 # We can't use links because not everyone supports them.  So just copy the
 # manpage.
-doc/g++.1:
-       if [ -f doc/gcc/man/man/gcc.1 ]; then cp doc/gcc/man/man/gcc.1 $@; fi
+doc/g++.1: doc/gcc/man/man/gcc.1
+       cp $< doc/g++.1
 
 c++.install-man: $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext)
 
-$(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/g++.1 ]; then rm -f $@; $(INSTALL_DATA) doc/g++.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext): doc/g++.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 c++.install-plugin: installdirs
 # We keep the directory structure for files in config and .def files. All

diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index b7a4ef3af1542c26a598d9267b361c41ace819a5..47bee4c74f4d7a58fea546d733f49391b40c1e1f 100644 (file)
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -307,7 +307,8 @@ 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)
 
 $(DESTDIR)$(infodir)/gdc.info: doc/gdc/info/texinfo/gdc.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 d.install-pdf: doc/gdc.pdf
        @$(NORMAL_INSTALL)
@@ -348,8 +349,10 @@ d.install-html: $(build_htmldir)/d
 
 d.install-man: $(DESTDIR)$(man1dir)/$(D_INSTALL_NAME)$(man1ext)
 
-$(DESTDIR)$(man1dir)/$(D_INSTALL_NAME)$(man1ext): installdirs
-       -if [ -f doc/gcc/man/man/gdc.1 ]; then rm -f $@; $(INSTALL_DATA) doc/gcc/man/man/gdc.1 $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(D_INSTALL_NAME)$(man1ext): doc/gdc/man/man/gdc.1 installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 d.uninstall:
        -rm -rf $(DESTDIR)$(bindir)/$(D_INSTALL_NAME)$(exeext)

diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 48acbed17545ab91ebebddd9ebd26cf8ec741062..dc2006d8bed4732d0978196785848fef3ef1319a 100644 (file)
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -227,12 +227,16 @@ fortran.install-plugin:
 fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info
 
 $(DESTDIR)$(infodir)/gfortran.info: doc/gfortran/info/texinfo/gfortran.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
 
-$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran/man/man/gfortran.1 installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran/man/man/gfortran.1 \
+               installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 fortran.uninstall:
        if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \

diff --git a/gcc/go/Make-lang.in b/gcc/go/Make-lang.in
index e1818de5901d54e1693e01160859d803f6fca71b..b1b1b5fc3caa6add81e42c4417ef7694a293fc57 100644 (file)
--- a/gcc/go/Make-lang.in
+++ b/gcc/go/Make-lang.in
@@ -155,7 +155,8 @@ go.install-plugin:
 go.install-info: $(DESTDIR)$(infodir)/gccgo.info
 
 $(DESTDIR)$(infodir)/gccgo.info: doc/gccgo/info/texinfo/gccgo.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 go.install-pdf: doc/gccgo.pdf
        @$(NORMAL_INSTALL)
@@ -187,7 +188,9 @@ go.install-html: $(build_htmldir)/go
 go.install-man: $(DESTDIR)$(man1dir)/$(GCCGO_INSTALL_NAME)$(man1ext)
 
 $(DESTDIR)$(man1dir)/$(GCCGO_INSTALL_NAME)$(man1ext): doc/gccgo/man/man/gccgo.1 installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; chmod a-x $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 go.uninstall:
        rm -rf $(DESTDIR)$(bindir)/$(GCCGO_INSTALL_NAME)$(exeext)

diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
index 4b592aaf60dc3a2141011250445b7f72b2eaa555..e972a25a55a0921e4424eedeabedd437507df937 100644 (file)
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -251,7 +251,8 @@ doc/libgccjit/info/texinfo/libgccjit.info: $(SPHINX_FILES)
 jit.install-info: $(DESTDIR)$(infodir)/libgccjit.info
 
 $(DESTDIR)$(infodir)/libgccjit.info: doc/libgccjit/info/texinfo/libgccjit.info installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; fi
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
 
 doc/libgccjit/html/html/index.html: $(SPHINX_FILES)
        + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/html SPHINXBUILD=$(SPHINX_BUILD)
@@ -392,8 +393,11 @@ endif
 
 jit.install-man: $(DESTDIR)$(man1dir)/libgccjit$(man1ext)
 
-$(DESTDIR)$(man1dir)/libgccjit$(man1ext): doc/libgccjit/man/man/libgccjit.1 installdirs
-       -if [ -f $< ]; then rm -f $@; $(INSTALL_DATA) $< $@; chmod a-x $@; fi
+$(DESTDIR)$(man1dir)/libgccjit$(man1ext): doc/libgccjit/man/man/libgccjit.1 \
+               installdirs
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@
+       -chmod a-x $@
 
 jit.install-plugin: