aboutsummaryrefslogtreecommitdiff
path: root/gcc/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/Makefile.in')
-rw-r--r--gcc/Makefile.in368
1 files changed, 142 insertions, 226 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f672e6e..7b037c1 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -113,14 +113,6 @@ target_objdir := $(toplevel_builddir)/$(target_subdir)
# Directory where sources are, from where we are.
VPATH = @srcdir@
-# We define a vpath for the sources of the .texi files here because they
-# are split between multiple directories and we would rather use one implicit
-# pattern rule for everything.
-# This vpath could be extended within the Make-lang fragments.
-
-vpath %.texi $(gcc_docdir)
-vpath %.texi $(gcc_docdir)/include
-
# --------
# UNSORTED
# --------
@@ -321,13 +313,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL@
install_sh = $(SHELL) $(srcdir)/../install-sh
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-MAKEINFO = @MAKEINFO@
-MAKEINFOFLAGS = --no-split
-TEXI2DVI = texi2dvi
-TEXI2PDF = texi2pdf
-TEXI2HTML = $(MAKEINFO) --html
-TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
-POD2MAN = pod2man --center="GNU" --release="gcc-$(version)" --date=$(shell sed 's/\(....\)\(..\)\(..\)/\1-\2-\3/' <$(DATESTAMP))
# Some versions of `touch' (such as the version on Solaris 2.8)
# do not correctly set the timestamp due to buggy versions of `utime'
# in the kernel. So, we use `echo' instead.
@@ -778,11 +763,8 @@ LIBCONVERT =
# Control whether header files are installed.
INSTALL_HEADERS=install-headers install-mkheaders
-# Control whether Info documentation is built and installed.
-BUILD_INFO = @BUILD_INFO@
-
-# Control whether manpages generated by texi2pod.pl can be rebuilt.
-GENERATED_MANPAGES = @GENERATED_MANPAGES@
+# Control whether manpages generated by sphinx-build can be rebuilt.
+SPHINX_BUILD = @SPHINX_BUILD@
# Additional directories of header files to run fixincludes on.
# These should be directories searched automatically by default
@@ -906,7 +888,6 @@ PKGVERSION_s:= "\"@PKGVERSION@\""
BUGURL_s := "\"@REPORT_BUGS_TO@\""
PKGVERSION := @PKGVERSION@
-BUGURL_TEXI := @REPORT_BUGS_TEXI@
ifdef REVISION_c
REVISION_s := \
@@ -1192,8 +1173,6 @@ FLAGS_TO_PASS = \
"LN=$(LN)" \
"LN_S=$(LN_S)" \
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
- "MAKEINFO=$(MAKEINFO)" \
- "MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
"MAKEOVERRIDES=" \
"SHELL=$(SHELL)" \
"TFLAGS=$(TFLAGS)" \
@@ -2574,8 +2553,6 @@ s-cfn-operators: build/gencfn-macros$(build_exeext)
cfn-operators.pd: s-cfn-operators; @true
target-hooks-def.h: s-target-hooks-def-h; @true
-# make sure that when we build info files, the used tm.texi is up to date.
-$(srcdir)/doc/tm.texi: s-tm-texi; @true
s-target-hooks-def-h: build/genhooks$(build_exeext)
$(RUN_GEN) build/genhooks$(build_exeext) "Target Hook" \
@@ -2611,38 +2588,20 @@ s-d-target-hooks-def-h: build/genhooks$(build_exeext)
d/d-target-hooks-def.h
$(STAMP) s-d-target-hooks-def-h
-# check if someone mistakenly only changed tm.texi.
-# We use a different pathname here to avoid a circular dependency.
-s-tm-texi: $(srcdir)/doc/../doc/tm.texi
-
-# The tm.texi we want to compare against / check into svn should have
+# The tm.rst.in we want to compare against / check into svn should have
# unix-style line endings. To make this work on MinGW, remove \r.
# \r is not portable to Solaris tr, therefore we have a special
# case for ASCII. We use \r for other encodings like EBCDIC.
-s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
- $(RUN_GEN) build/genhooks$(build_exeext) -d \
- $(srcdir)/doc/tm.texi.in > tmp-tm.texi
- case `echo X|tr X '\101'` in \
- A) tr -d '\015' < tmp-tm.texi > tmp2-tm.texi ;; \
- *) tr -d '\r' < tmp-tm.texi > tmp2-tm.texi ;; \
- esac
- mv tmp2-tm.texi tmp-tm.texi
- $(SHELL) $(srcdir)/../move-if-change tmp-tm.texi tm.texi
- @if cmp -s $(srcdir)/doc/tm.texi tm.texi; then \
+s-tm-rst-in: build/genhooks$(build_exeext) $(srcdir)/doc/gccint/target-macros/tm.rst.in
+ $(RUN_GEN) build/genhooks$(build_exeext) > tmp-tm.rst.in
+ $(SHELL) $(srcdir)/../move-if-change tmp-tm.rst.in tm.rst.in
+
+ @if cmp -s $(srcdir)/doc/gccint/target-macros/tm.rst.in tm.rst.in; then \
$(STAMP) $@; \
- elif test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/tm.texi.in \
- && ( test $(srcdir)/doc/tm.texi -nt $(srcdir)/target.def \
- || test $(srcdir)/doc/tm.texi -nt $(srcdir)/c-family/c-target.def \
- || test $(srcdir)/doc/tm.texi -nt $(srcdir)/common/common-target.def \
- || test $(srcdir)/doc/tm.texi -nt $(srcdir)/d/d-target.def \
- ); then \
- echo >&2 ; \
- echo You should edit $(srcdir)/doc/tm.texi.in rather than $(srcdir)/doc/tm.texi . >&2 ; \
- false; \
else \
echo >&2 ; \
echo Verify that you have permission to grant a GFDL license for all >&2 ; \
- echo new text in $(objdir)/tm.texi, then copy it to $(srcdir)/doc/tm.texi. >&2 ; \
+ echo new text in $(objdir)/tm.rst.in, then copy it to $(srcdir)/doc/gccint/target-macros/tm.rst.in. >&2 ; \
false; \
fi
@@ -3315,121 +3274,38 @@ install-no-fixedincludes:
# Remake the info files.
-doc: $(BUILD_INFO) $(GENERATED_MANPAGES)
+doc: $(SPHINX_BUILD)
-INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \
- doc/gccinstall.info doc/cppinternals.info
+INFOFILES = doc/gcc/info/texinfo/gcc.info \
+ doc/gccint/info/texinfo/gccint.info \
+ doc/cpp/info/texinfo/cpp.info \
+ doc/cppinternals/info/texinfo/cppinternals.info \
+ doc/install/info/texinfo/install.info
info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
srcinfo: $(INFOFILES)
-cp -p $^ $(srcdir)/doc
-TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi \
- gcc-common.texi gcc-vers.texi
-
-TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi \
- standards.texi invoke.texi extend.texi md.texi objc.texi \
- gcov.texi trouble.texi bugreport.texi service.texi \
- contribute.texi compat.texi funding.texi gnu.texi gpl_v3.texi \
- fdl.texi contrib.texi cppenv.texi cppopts.texi avr-mmcu.texi \
- implement-c.texi implement-cxx.texi gcov-tool.texi gcov-dump.texi \
- lto-dump.texi
-
-# we explicitly use $(srcdir)/doc/tm.texi here to avoid confusion with
-# the generated tm.texi; the latter might have a more recent timestamp,
-# but we don't want to rebuild the info files unless the contents of
-# the *.texi files have changed.
-TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi \
- contribute.texi makefile.texi configterms.texi options.texi \
- portability.texi interface.texi passes.texi rtl.texi md.texi \
- $(srcdir)/doc/tm.texi hostconfig.texi fragments.texi \
- configfiles.texi collect2.texi headerdirs.texi funding.texi \
- gnu.texi gpl_v3.texi fdl.texi contrib.texi languages.texi \
- sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi \
- loop.texi generic.texi gimple.texi plugins.texi optinfo.texi \
- match-and-simplify.texi analyzer.texi ux.texi poly-int.texi
-
-TEXI_GCCINSTALL_FILES = install.texi fdl.texi \
- gcc-common.texi gcc-vers.texi
-
-TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
-
-# gcc-vers.texi is generated from the version files.
-gcc-vers.texi: $(BASEVER) $(DEVPHASE)
- (echo "@set version-GCC $(BASEVER_c)"; \
- if [ "$(DEVPHASE_c)" = "experimental" ]; \
- then echo "@set DEVELOPMENT"; \
- else echo "@clear DEVELOPMENT"; \
- fi) > $@T
- $(build_file_translate) echo @set srcdir `echo $(abs_srcdir) | sed -e 's|\\([@{}]\\)|@\\1|g'` >> $@T
- if [ -n "$(PKGVERSION)" ]; then \
- echo "@set VERSION_PACKAGE $(PKGVERSION)" >> $@T; \
- fi
- echo "@set BUGURL $(BUGURL_TEXI)" >> $@T; \
- mv -f $@T $@
-
-
-# The *.1, *.7, *.info, *.dvi, and *.pdf files are being generated from implicit
-# patterns. To use them, put each of the specific targets with its
-# specific dependencies but no build commands.
-
-doc/cpp.info: $(TEXI_CPP_FILES)
-doc/gcc.info: $(TEXI_GCC_FILES)
-doc/gccint.info: $(TEXI_GCCINT_FILES)
-doc/cppinternals.info: $(TEXI_CPPINT_FILES)
-
-doc/%.info: %.texi
- if [ x$(BUILD_INFO) = xinfo ]; then \
- $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
- -I $(gcc_docdir)/include -o $@ $<; \
- fi
-
-# Duplicate entry to handle renaming of gccinstall.info
-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
- if [ x$(BUILD_INFO) = xinfo ]; then \
- $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
- -I $(gcc_docdir)/include -o $@ $<; \
- fi
-
-doc/cpp.dvi: $(TEXI_CPP_FILES)
-doc/gcc.dvi: $(TEXI_GCC_FILES)
-doc/gccint.dvi: $(TEXI_GCCINT_FILES)
-doc/cppinternals.dvi: $(TEXI_CPPINT_FILES)
-
-doc/cpp.pdf: $(TEXI_CPP_FILES)
-doc/gcc.pdf: $(TEXI_GCC_FILES)
-doc/gccint.pdf: $(TEXI_GCCINT_FILES)
-doc/cppinternals.pdf: $(TEXI_CPPINT_FILES)
-
-$(build_htmldir)/cpp/index.html: $(TEXI_CPP_FILES)
-$(build_htmldir)/gcc/index.html: $(TEXI_GCC_FILES)
-$(build_htmldir)/gccint/index.html: $(TEXI_GCCINT_FILES)
-$(build_htmldir)/cppinternals/index.html: $(TEXI_CPPINT_FILES)
-
-DVIFILES = doc/gcc.dvi doc/gccint.dvi doc/gccinstall.dvi doc/cpp.dvi \
- doc/cppinternals.dvi
-
-dvi:: $(DVIFILES) lang.dvi
+PDFFILES = doc/gcc/pdf/latex/gcc.pdf doc/gccint/pdf/latex/gccint.pdf doc/install/pdf/latex/install.pdf \
+ doc/cpp/pdf/latex/cpp.pdf doc/cppinternals/pdf/latex/cppinternals.pdf
-doc/%.dvi: %.texi
- $(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+pdf:: $(PDFFILES) lang.pdf
-# Duplicate entry to handle renaming of gccinstall.dvi
-doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
- $(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/gcc/pdf/latex/gcc.pdf: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/pdf
-PDFFILES = doc/gcc.pdf doc/gccint.pdf doc/gccinstall.pdf doc/cpp.pdf \
- doc/cppinternals.pdf
+doc/gccint/pdf/latex/gccint.pdf: $(SPHINX_FILES) s-tm-rst-in
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/pdf
-pdf:: $(PDFFILES) lang.pdf
+doc/install/pdf/latex/install.pdf: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/pdf
-doc/%.pdf: %.texi
- $(TEXI2PDF) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/cpp/pdf/latex/cpp.pdf: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/pdf
-# Duplicate entry to handle renaming of gccinstall.pdf
-doc/gccinstall.pdf: $(TEXI_GCCINSTALL_FILES)
- $(TEXI2PDF) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/cppinternals/pdf/latex/cppinternals.pdf: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/pdf
# List the directories or single hmtl files which are installed by
# install-html. The lang.html file triggers language fragments to build
@@ -3439,70 +3315,75 @@ HTMLS_INSTALL=$(build_htmldir)/cpp $(build_htmldir)/gcc \
$(build_htmldir)/cppinternals
# List the html file targets.
-HTMLS_BUILD=$(build_htmldir)/cpp/index.html $(build_htmldir)/gcc/index.html \
- $(build_htmldir)/gccinstall/index.html $(build_htmldir)/gccint/index.html \
- $(build_htmldir)/cppinternals/index.html lang.html
+HTMLS = doc/gcc/html/html/index.html doc/gccint/html/html/index.html doc/install/html/html/index.html \
+ doc/cpp/html/html/index.html doc/cppinternals/html/html/index.html
+
+html:: $(HTMLS) lang.html
+
+doc/gcc/html/html/index.html: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/html
+
+doc/gccint/html/html/index.html: $(SPHINX_FILES) s-tm-rst-in
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/html
-html:: $(HTMLS_BUILD)
+doc/install/html/html/index.html: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/html
-$(build_htmldir)/%/index.html: %.texi
- $(mkinstalldirs) $(@D)
- rm -f $(@D)/*
- $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
+doc/cpp/html/html/index.html: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/html
-# Duplicate entry to handle renaming of gccinstall
-$(build_htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
- $(mkinstalldirs) $(@D)
- echo rm -f $(@D)/*
- SOURCEDIR=$(abs_docdir) \
- DESTDIR=$(@D) \
- $(SHELL) $(srcdir)/doc/install.texi2html
+doc/cppinternals/html/html/index.html: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/html
-MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 \
- doc/fsf-funding.7 doc/gcov-tool.1 doc/gcov-dump.1 \
- $(if $(filter yes,@enable_lto@),doc/lto-dump.1)
+MANFILES = doc/gcc/man/man/gcc.1 doc/cpp/man/man/cpp.1 \
+ doc/gcc/man/man/gfdl.7 doc/gcc/man/man/gpl.7 \
+ doc/gcc/man/man/fsf-funding.7 doc/gcc/man/man/gcov-tool.1 \
+ doc/gcc/man/man/gcov.1 doc/gcc/man/man/gcov-dump.1 \
+ $(if $(filter yes,@enable_lto@),doc/gcc/man/man/lto-dump.1)
-generated-manpages: man
+export VERSION_PACKAGE=$(PKGVERSION)
+export ENABLE_LTO=$(enable_lto)
+export BUGURL="$(BUGURL_s)"
man: $(MANFILES) lang.man @GENINSRC@ srcman lang.srcman
srcman: $(MANFILES)
-cp -p $^ $(srcdir)/doc
-doc/%.1: %.pod
- $(STAMP) $@
- -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
- mv -f $(@).T$$$$ $@) || \
- (rm -f $(@).T$$$$ && exit 1)
+sphinx-build: man info
-doc/%.7: %.pod
- $(STAMP) $@
- -($(POD2MAN) --section=7 $< > $(@).T$$$$ && \
- mv -f $(@).T$$$$ $@) || \
- (rm -f $(@).T$$$$ && exit 1)
+RST_FILES:=$(shell find $(srcdir) -name *.rst -or -name *.rst.in)
+SPHINX_CONFIG_FILES:=$(shell find $(srcdir)/.. -name conf.py) $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
-%.pod: %.texi
- $(STAMP) $@
- -$(TEXI2POD) -DBUGURL="$(BUGURL_TEXI)" $< > $@
+doc/gcc/man/man/gcc.1: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/man
-.INTERMEDIATE: cpp.pod gcc.pod gfdl.pod fsf-funding.pod gpl.pod
-cpp.pod: cpp.texi cppenv.texi cppopts.texi
+doc/gcc/man/man/gcov.1: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/gcov-tool.1: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/gcov-dump.1: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/lto-dump.1: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/gfdl.7: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/gpl.7: doc/gcc/man/man/gcc.1
+doc/gcc/man/man/fsf-funding.7: doc/gcc/man/man/gcc.1
-# These next rules exist because the output name is not the same as
-# the input name, so our implicit %.pod rule will not work.
+doc/cpp/man/man/cpp.1: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/man
-gcc.pod: invoke.texi cppenv.texi cppopts.texi gcc-vers.texi
- $(STAMP) $@
- -$(TEXI2POD) $< > $@
-gfdl.pod: fdl.texi
- $(STAMP) $@
- -$(TEXI2POD) $< > $@
-fsf-funding.pod: funding.texi
- $(STAMP) $@
- -$(TEXI2POD) $< > $@
-gpl.pod: gpl_v3.texi
- $(STAMP) $@
- -$(TEXI2POD) $< > $@
+doc/gcc/info/texinfo/gcc.info: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/info
+
+doc/gccint/info/texinfo/gccint.info: $(SPHINX_FILES) s-tm-rst-in
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/info
+
+doc/cpp/info/texinfo/cpp.info: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/info
+
+doc/cppinternals/info/texinfo/cppinternals.info: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/info
+
+doc/install/info/texinfo/install.info: $(SPHINX_FILES)
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/info
#
# Deletion of files made during compilation.
@@ -3562,8 +3443,7 @@ clean: mostlyclean lang.clean
-rm -f config.h tconfig.h bconfig.h tm_p.h tm.h
-rm -f options.cc options.h optionlist
-rm -f cs-*
- -rm -f doc/*.dvi
- -rm -f doc/*.pdf
+ -rm -rf doc
# Delete the include directories.
-rm -rf include include-fixed
# Delete files used by the "multilib" facility (including libgcc subdirs).
@@ -3591,7 +3471,6 @@ distclean: clean lang.distclean
-cd testsuite && rm -f *.out *.gcov *$(coverageexts)
-rm -rf ${QMTEST_DIR} stamp-qmtest
-rm -f .gdbinit configargs.h
- -rm -f gcov.pod
# Delete po/*.gmo only if we are not building in the source directory.
-if [ ! -f po/exgettext ]; then rm -f po/*.gmo; fi
-rmdir ada cp f java objc intl po testsuite plugin 2>/dev/null
@@ -3604,7 +3483,7 @@ maintainer-clean:
$(MAKE) lang.maintainer-clean distclean
-rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*aux
- -rm -f $(gcc_docdir)/*.info $(gcc_docdir)/*.1 $(gcc_docdir)/*.7 $(gcc_docdir)/*.dvi $(gcc_docdir)/*.pdf
+ -rm -rf doc
#
# Entry points `install', `install-strip', and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
@@ -3801,24 +3680,46 @@ install-info:: doc installdirs \
$(DESTDIR)$(infodir)/cpp.info \
$(DESTDIR)$(infodir)/gcc.info \
$(DESTDIR)$(infodir)/cppinternals.info \
- $(DESTDIR)$(infodir)/gccinstall.info \
+ $(DESTDIR)$(infodir)/install.info \
$(DESTDIR)$(infodir)/gccint.info \
lang.install-info
-$(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
- rm -f $@
- if [ -f $< ]; then \
- for f in $(<)*; do \
- realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
- $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
- chmod a-x $(DESTDIR)$(infodir)/$$realfile; \
- done; \
- else true; fi
- -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- if [ -f $@ ]; then \
- install-info --dir-file=$(DESTDIR)$(infodir)/dir $@; \
- else true; fi; \
- else true; fi;
+$(DESTDIR)$(infodir)/gcc.info: doc/gcc/info/texinfo/gcc.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/gccint.info: doc/gccint/info/texinfo/gccint.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/install.info: doc/install/info/texinfo/install.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/cpp.info: doc/cpp/info/texinfo/cpp.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/cppinternals.info: doc/cppinternals/info/texinfo/cppinternals.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/gcov.info: doc/gcc/info/texinfo/gcov.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(DESTDIR)$(infodir)/gcov-tool.info: doc/gcc/info/texinfo/gcov-tool.info installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+
+$(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) $< $@
+
dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -3846,7 +3747,7 @@ install-pdf: $(PDFFILES) lang.install-pdf
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-html: $(HTMLS_BUILD) lang.install-html
+install-html: $(HTMLS) lang.install-html
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
@list='$(HTMLS_INSTALL)'; for p in $$list; do \
@@ -3880,32 +3781,47 @@ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 installdirs
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1 installdirs
+$(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): doc/cpp/man/man/cpp.1 installdirs
+ -rm -f $@
+ -$(INSTALL_DATA) $< $@
+ -chmod a-x $@
+
+$(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): doc/gcc/man/man/gcov-tool.1 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext): doc/cpp.1 installdirs
+$(DESTDIR)$(man1dir)/$(GCOV_DUMP_INSTALL_NAME)$(man1ext): doc/gcc/man/man/gcov-dump.1 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): doc/gcov.1 installdirs
+$(DESTDIR)$(man1dir)/$(LTO_DUMP_INSTALL_NAME)$(man1ext): doc/gcc/man/man/lto-dump.1 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(GCOV_TOOL_INSTALL_NAME)$(man1ext): doc/gcov-tool.1 installdirs
+$(DESTDIR)$(man7dir)/fsf-funding$(man7ext): doc/gcc/man/man/fsf-funding.7 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(GCOV_DUMP_INSTALL_NAME)$(man1ext): doc/gcov-dump.1 installdirs
+$(DESTDIR)$(man7dir)/gfdl$(man7ext): doc/gcc/man/man/gfdl.7 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-$(DESTDIR)$(man1dir)/$(LTO_DUMP_INSTALL_NAME)$(man1ext): doc/lto-dump.1 installdirs
+$(DESTDIR)$(man7dir)/gpl$(man7ext): doc/gcc/man/man/gpl.7 installdirs
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@