diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 428f7a9dab5..ab5e86b0f98 100644
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -11,6 +11,8 @@ config_path = @config_path@
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
  	      $(top_srcdir)/../include
  
+abs_doc_builddir = @abs_top_builddir@/doc
+
  fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
  
@@ -100,18 +102,6 @@ fortran.o: libgomp_f.h
  env.lo: libgomp_f.h
  env.o: libgomp_f.h
  
-
-# Automake Documentation:
-# If your package has Texinfo files in many directories, you can use the
-# variable TEXINFO_TEX to tell Automake where to find the canonical
-# `texinfo.tex' for your package. The value of this variable should be
-# the relative path from the current `Makefile.am' to `texinfo.tex'.
-TEXINFO_TEX   = ../gcc/doc/include/texinfo.tex
-
-# Defines info, dvi, pdf and html targets
-MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-info_TEXINFOS = libgomp.texi
-
  # AM_CONDITIONAL on configure option --generated-files-in-srcdir
  if GENINSRC
  STAMP_GENINSRC = stamp-geninsrc
@@ -127,7 +117,7 @@ STAMP_BUILD_INFO =
  endif
  
  
-all-local: $(STAMP_GENINSRC)
+all-local: $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  
  stamp-geninsrc: libgomp.info
  	cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info
@@ -135,8 +125,15 @@ stamp-geninsrc: libgomp.info
  
  libgomp.info: $(STAMP_BUILD_INFO)
  
-stamp-build-info: libgomp.texi
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+
+stamp-build-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); \
+	  cp ./doc/info/texinfo/libgomp.info libgomp.info; \
+	else true; fi
  	@touch $@
  
  
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 814ccd13dc0..4d0f2184e95 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -177,7 +177,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
-am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" \
+am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
  	"$(DESTDIR)$(fincludedir)" "$(DESTDIR)$(libsubincludedir)" \
  	"$(DESTDIR)$(toolexeclibdir)"
  LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
@@ -269,16 +269,9 @@ am__v_FCLD_0 = @echo "  FCLD    " $@;
  am__v_FCLD_1 =
  SOURCES = $(libgomp_plugin_gcn_la_SOURCES) \
  	$(libgomp_plugin_nvptx_la_SOURCES) $(libgomp_la_SOURCES)
-AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
-am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
-am__v_DVIPS_0 = @echo "  DVIPS   " $@;
-am__v_DVIPS_1 =
-INFO_DEPS = doc/info/texinfo/libgomp.info
-PDFS = doc/pdf/latex/libgomp.pdf
-HTMLS = doc/html/html/index.html
  RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive html-recursive info-recursive \
-	install-data-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
  	install-exec-recursive install-html-recursive \
  	install-info-recursive install-pdf-recursive \
  	install-ps-recursive install-recursive installcheck-recursive \
@@ -332,6 +325,7 @@ AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
+CONFIGURE_SPHINX_BUILD = @CONFIGURE_SPHINX_BUILD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CPU_COUNT = @CPU_COUNT@
@@ -350,6 +344,7 @@ FC = @FC@
  FCFLAGS = @FCFLAGS@
  FGREP = @FGREP@
  GREP = @GREP@
+HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -365,6 +360,7 @@ LIPO = @LIPO@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
  MKDIR_P = @MKDIR_P@
  NM = @NM@
  NMEDIT = @NMEDIT@
@@ -401,7 +397,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SPHINX_BUILD = @SPHINX_BUILD@
-HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  STRIP = @STRIP@
  VERSION = @VERSION@
  XCFLAGS = @XCFLAGS@
@@ -409,7 +404,6 @@ XLDFLAGS = @XLDFLAGS@
  abs_builddir = @abs_builddir@
  abs_srcdir = @abs_srcdir@
  abs_top_builddir = @abs_top_builddir@
-abs_doc_builddir = @abs_top_builddir@/doc
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -430,6 +424,7 @@ config_path = @config_path@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
+dvidir = @dvidir@
  enable_shared = @enable_shared@
  enable_static = @enable_static@
  exec_prefix = @exec_prefix@
@@ -484,6 +479,7 @@ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
  	      $(top_srcdir)/../include
  
+abs_doc_builddir = @abs_top_builddir@/doc
  fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
  AM_CPPFLAGS = $(addprefix -I, $(search_path))
@@ -561,7 +557,6 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
  LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
  	$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@
  
-
  @GENINSRC_FALSE@STAMP_GENINSRC =
  
  # AM_CONDITIONAL on configure option --generated-files-in-srcdir
@@ -570,6 +565,9 @@ LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info
+RST_FILES := $(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES := $(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES := $(RST_FILES) $(SPHINX_CONFIG_FILES)
  CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  MAINTAINERCLEANFILES = $(srcdir)/libgomp.info
  MULTISRCTOP =
@@ -582,7 +580,7 @@ all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
  .SUFFIXES:
-.SUFFIXES: .c .f90 .lo .o .obj .ps
+.SUFFIXES: .c .f90 .lo .o .obj
  am--refresh: Makefile
  	@:
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/plugin/Makefrag.am $(top_srcdir)/../multilib.am $(am__configure_deps)
@@ -793,84 +791,6 @@ clean-libtool:
  
  distclean-libtool:
  	-rm -f libtool config.lt
-
-doc/pdf/latex/libgomp.pdf: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
-
-doc/html/html/index.html: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
-
-uninstall-info-am:
-	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-	    then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
-	  done; \
-	else :; fi
-	@$(NORMAL_UNINSTALL)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-	   else :; fi); \
-	done
-
-uninstall-pdf-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
-	done
-
-uninstall-ps-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
-	done
-
-dist-info: $(INFO_DEPS)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  case $$base in \
-	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-	    if test -f $$file; then \
-	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	      test -f "$(distdir)/$$relfile" || \
-		cp -p $$file "$(distdir)/$$relfile"; \
-	    else :; fi; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -rf libgomp.t2d libgomp.t2p
-
-clean-aminfo:
-	-test -z "doc/pdf/latex/libgomp.pdf libgomp.html" \
-	|| rm -rf doc/pdf/latex/libgomp.pdf libgomp.html
-
-maintainer-clean-aminfo:
-	@list='$(INFO_DEPS)'; for i in $$list; do \
-	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-	done
  install-nodist_fincludeHEADERS: $(nodist_finclude_HEADERS)
  	@$(NORMAL_INSTALL)
  	@list='$(nodist_finclude_HEADERS)'; test -n "$(fincludedir)" || list=; \
@@ -1042,11 +962,10 @@ distclean-tags:
  	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
  check-am: all-am
  check: check-recursive
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h \
-		all-local
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-local
  installdirs: installdirs-recursive
  installdirs-am:
-	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(fincludedir)" "$(DESTDIR)$(libsubincludedir)" "$(DESTDIR)$(toolexeclibdir)"; do \
+	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(fincludedir)" "$(DESTDIR)$(libsubincludedir)" "$(DESTDIR)$(toolexeclibdir)"; do \
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-recursive
@@ -1083,7 +1002,7 @@ maintainer-clean-generic:
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  clean: clean-recursive
  
-clean-am: clean-aminfo clean-generic clean-libtool clean-local \
+clean-am: clean-generic clean-libtool clean-local \
  	clean-toolexeclibLTLIBRARIES mostlyclean-am
  
  distclean: distclean-recursive
@@ -1093,117 +1012,46 @@ distclean: distclean-recursive
  distclean-am: clean-am distclean-compile distclean-generic \
  	distclean-hdr distclean-libtool distclean-local distclean-tags
  
+dvi: dvi-recursive
+
+dvi-am:
  
  html: html-recursive
  
-html-am: $(HTMLS)
+html-am:
  
  info: info-recursive
  
-info-am: $(INFO_DEPS)
+info-am:
  
-install-data-am: install-info-am install-nodist_fincludeHEADERS \
+install-data-am: install-nodist_fincludeHEADERS \
  	install-nodist_libsubincludeHEADERS
  
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
  install-exec-am: install-exec-local install-nodist_toolexeclibHEADERS \
  	install-toolexeclibLTLIBRARIES
  
  install-html: install-html-recursive
  
-install-html-am: $(HTMLS)
-	@$(NORMAL_INSTALL)
-	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__strip_dir) \
-	  d2=$$d$$p; \
-	  if test -d "$$d2"; then \
-	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-	  else \
-	    list2="$$list2 $$d2"; \
-	  fi; \
-	done; \
-	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
-	done; }
+install-html-am:
+
  install-info: install-info-recursive
  
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
-	fi; \
-	for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-	    if test -f $$ifile; then \
-	      echo "$$ifile"; \
-	    else : ; fi; \
-	  done; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
-	@$(POST_INSTALL)
-	@if $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
+install-info-am:
+
  install-man:
  
  install-pdf: install-pdf-recursive
  
-install-pdf-am: $(PDFS)
-	@$(NORMAL_INSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
+install-pdf-am:
+
  install-ps: install-ps-recursive
  
-install-ps-am: $(PSS)
-	@$(NORMAL_INSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+install-ps-am:
+
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
@@ -1211,39 +1059,37 @@ maintainer-clean: maintainer-clean-recursive
  	-rm -rf $(top_srcdir)/autom4te.cache
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
  
  mostlyclean: mostlyclean-recursive
  
-mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local
  
  pdf: pdf-recursive
  
-pdf-am: $(PDFS)
+pdf-am:
  
  ps: ps-recursive
  
-ps-am: $(PSS)
+ps-am:
  
-uninstall-am: uninstall-html-am uninstall-info-am \
-	uninstall-nodist_fincludeHEADERS \
+uninstall-am: uninstall-nodist_fincludeHEADERS \
  	uninstall-nodist_libsubincludeHEADERS \
-	uninstall-nodist_toolexeclibHEADERS uninstall-pdf-am \
-	uninstall-ps-am uninstall-toolexeclibLTLIBRARIES
+	uninstall-nodist_toolexeclibHEADERS \
+	uninstall-toolexeclibLTLIBRARIES
  
  .MAKE: $(am__recursive_targets) all install-am install-strip
  
  .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--refresh check check-am clean clean-aminfo clean-cscope \
-	clean-generic clean-libtool clean-local \
-	clean-toolexeclibLTLIBRARIES cscope cscopelist-am ctags \
-	ctags-am dist-info distclean distclean-compile \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool clean-local clean-toolexeclibLTLIBRARIES cscope \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
  	distclean-generic distclean-hdr distclean-libtool \
-	distclean-local distclean-tags html html-am info \
+	distclean-local distclean-tags dvi dvi-am html html-am info \
  	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
  	install-exec-local install-html install-html-am install-info \
  	install-info-am install-man install-nodist_fincludeHEADERS \
  	install-nodist_libsubincludeHEADERS \
@@ -1251,15 +1097,13 @@ uninstall-am: uninstall-html-am uninstall-info-am \
  	install-ps install-ps-am install-strip \
  	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
  	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-aminfo \
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
  	mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-html-am \
-	uninstall-info-am uninstall-nodist_fincludeHEADERS \
+	uninstall-am uninstall-nodist_fincludeHEADERS \
  	uninstall-nodist_libsubincludeHEADERS \
-	uninstall-nodist_toolexeclibHEADERS uninstall-pdf-am \
-	uninstall-ps-am uninstall-toolexeclibLTLIBRARIES
+	uninstall-nodist_toolexeclibHEADERS \
+	uninstall-toolexeclibLTLIBRARIES
  
  .PRECIOUS: Makefile
  
@@ -1292,23 +1136,20 @@ fortran.o: libgomp_f.h
  env.lo: libgomp_f.h
  env.o: libgomp_f.h
  
-all-local: $(STAMP_GENINSRC)
-
-RST_FILES:=$(shell find $(srcdir) -name *.rst)
-SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
-SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+all-local: $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  
-export BUGURL=$(PACKAGE_BUGURL)
-
-stamp-geninsrc: doc/info/texinfo/libgomp.info
+stamp-geninsrc: libgomp.info
  	cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info
  	@touch $@
  
-doc/info/texinfo/libgomp.info: $(SPHINX_FILES)
+libgomp.info: $(STAMP_BUILD_INFO)
+
+stamp-build-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); \
+	  cp ./doc/info/texinfo/libgomp.info libgomp.info; \
  	else true; fi
-
+	@touch $@
  
  # target overrides
  -include $(tmake_file)
diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index 7a88f0fe5c6..e11c9107c07 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -144,6 +144,7 @@ AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
+CONFIGURE_SPHINX_BUILD = @CONFIGURE_SPHINX_BUILD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CPU_COUNT = @CPU_COUNT@
@@ -162,6 +163,7 @@ FC = @FC@
  FCFLAGS = @FCFLAGS@
  FGREP = @FGREP@
  GREP = @GREP@
+HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -213,6 +215,7 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
+SPHINX_BUILD = @SPHINX_BUILD@
  STRIP = @STRIP@
  VERSION = @VERSION@
  XCFLAGS = @XCFLAGS@
diff --git a/libitm/Makefile.am b/libitm/Makefile.am
index 3f31ad30556..6cc7735cb4e 100644
--- a/libitm/Makefile.am
+++ b/libitm/Makefile.am
@@ -12,6 +12,8 @@ abi_version = -fabi-version=4
  config_path = @config_path@
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)
  
+abs_doc_builddir = @abs_top_builddir@/doc
+
  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
  
  vpath % $(strip $(search_path))
@@ -79,17 +81,6 @@ if ARCH_FUTEX
  libitm_la_SOURCES += futex.cc
  endif
  
-# Automake Documentation:
-# If your package has Texinfo files in many directories, you can use the
-# variable TEXINFO_TEX to tell Automake where to find the canonical
-# `texinfo.tex' for your package. The value of this variable should be
-# the relative path from the current `Makefile.am' to `texinfo.tex'.
-TEXINFO_TEX   = ../gcc/doc/include/texinfo.tex
-
-# Defines info, dvi, pdf and html targets
-MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-info_TEXINFOS = libitm.texi
-
  # AM_CONDITIONAL on configure option --generated-files-in-srcdir
  if GENINSRC
  STAMP_GENINSRC = stamp-geninsrc
@@ -105,7 +96,7 @@ STAMP_BUILD_INFO =
  endif
  
  
-all-local: $(STAMP_GENINSRC)
+all-local: $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  
  stamp-geninsrc: libitm.info
  	cp -p $(top_builddir)/libitm.info $(srcdir)/libitm.info
@@ -113,8 +104,15 @@ stamp-geninsrc: libitm.info
  
  libitm.info: $(STAMP_BUILD_INFO)
  
-stamp-build-info: libitm.texi
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libitm.info $(srcdir)/libitm.texi
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+
+stamp-build-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); \
+	  cp ./doc/info/texinfo/libitm.info libitm.info; \
+	else true; fi
  	@touch $@
  
  
diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index a07b9ebc6d0..a4d5f96962a 100644
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
-am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" \
+am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
  	"$(DESTDIR)$(toolexeclibdir)"
  LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
  libitm_la_LIBADD =
@@ -230,9 +230,6 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 =
  SOURCES = $(libitm_la_SOURCES)
-INFO_DEPS = doc/info/texinfo/libitm.info
-PDFS = doc/pdf/latex/libitm.pdf
-HTMLS = doc/html/html/index.html
  RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
  	ctags-recursive dvi-recursive html-recursive info-recursive \
  	install-data-recursive install-dvi-recursive \
@@ -291,6 +288,7 @@ CCASDEPMODE = @CCASDEPMODE@
  CCASFLAGS = @CCASFLAGS@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
+CONFIGURE_SPHINX_BUILD = @CONFIGURE_SPHINX_BUILD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
@@ -309,6 +307,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  FGREP = @FGREP@
  GREP = @GREP@
+HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  HWCAP_LDFLAGS = @HWCAP_LDFLAGS@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
@@ -324,6 +323,7 @@ LIPO = @LIPO@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
  MKDIR_P = @MKDIR_P@
  NM = @NM@
  NMEDIT = @NMEDIT@
@@ -347,7 +347,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SPHINX_BUILD = @SPHINX_BUILD@
-HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  STRIP = @STRIP@
  VERSION = @VERSION@
  XCFLAGS = @XCFLAGS@
@@ -355,7 +354,6 @@ XLDFLAGS = @XLDFLAGS@
  abs_builddir = @abs_builddir@
  abs_srcdir = @abs_srcdir@
  abs_top_builddir = @abs_top_builddir@
-abs_doc_builddir = @abs_top_builddir@/doc
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -424,6 +422,7 @@ SUBDIRS = testsuite
  gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
  abi_version = -fabi-version=4
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)
+abs_doc_builddir = @abs_top_builddir@/doc
  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
  AM_CPPFLAGS = $(addprefix -I, $(search_path))
  AM_CFLAGS = $(XCFLAGS)
@@ -452,6 +451,7 @@ libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \
  	retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \
  	method-serial.cc method-gl.cc method-ml.cc $(am__append_1) \
  	$(am__append_2) $(am__append_3)
+@GENINSRC_FALSE@STAMP_GENINSRC =
  
  # AM_CONDITIONAL on configure option --generated-files-in-srcdir
  @GENINSRC_TRUE@STAMP_GENINSRC = stamp-geninsrc
@@ -459,6 +459,9 @@ libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info
+RST_FILES := $(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES := $(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES := $(RST_FILES) $(SPHINX_CONFIG_FILES)
  CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  MAINTAINERCLEANFILES = $(srcdir)/libitm.info
  MULTISRCTOP =
@@ -471,7 +474,7 @@ all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
  .SUFFIXES:
-.SUFFIXES: .S .cc .dvi .lo .o .obj .ps
+.SUFFIXES: .S .cc .lo .o .obj
  am--refresh: Makefile
  	@:
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(am__configure_deps)
@@ -642,93 +645,6 @@ clean-libtool:
  
  distclean-libtool:
  	-rm -f libtool config.lt
-
-doc/pdf/latex/libitm.pdf: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
-
-doc/html/html/index.html: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
-
-uninstall-html-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
-	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
-	done
-
-uninstall-info-am:
-	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-	    then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
-	  done; \
-	else :; fi
-	@$(NORMAL_UNINSTALL)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-	   else :; fi); \
-	done
-
-uninstall-pdf-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
-	done
-
-uninstall-ps-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
-	done
-
-dist-info: $(INFO_DEPS)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  case $$base in \
-	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-	    if test -f $$file; then \
-	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	      test -f "$(distdir)/$$relfile" || \
-		cp -p $$file "$(distdir)/$$relfile"; \
-	    else :; fi; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -rf libitm.t2d libitm.t2p
-
-clean-aminfo:
-	-test -z "doc/pdf/latex/libitm.pdf libitm.html" \
-	|| rm -rf doc/pdf/latex/libitm.pdf libitm.html
-
-maintainer-clean-aminfo:
-	@list='$(INFO_DEPS)'; for i in $$list; do \
-	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-	done
  install-nodist_toolexeclibHEADERS: $(nodist_toolexeclib_HEADERS)
  	@$(NORMAL_INSTALL)
  	@list='$(nodist_toolexeclib_HEADERS)'; test -n "$(toolexeclibdir)" || list=; \
@@ -858,11 +774,10 @@ distclean-tags:
  	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
  check-am: all-am
  check: check-recursive
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h \
-		all-local
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-local
  installdirs: installdirs-recursive
  installdirs-am:
-	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(toolexeclibdir)"; do \
+	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)"; do \
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-recursive
@@ -899,7 +814,7 @@ maintainer-clean-generic:
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  clean: clean-recursive
  
-clean-am: clean-aminfo clean-generic clean-libtool clean-local \
+clean-am: clean-generic clean-libtool clean-local \
  	clean-toolexeclibLTLIBRARIES mostlyclean-am
  
  distclean: distclean-recursive
@@ -911,134 +826,43 @@ distclean-am: clean-am distclean-compile distclean-generic \
  
  dvi: dvi-recursive
  
-dvi-am: $(DVIS)
+dvi-am:
  
  html: html-recursive
  
-html-am: $(HTMLS)
+html-am:
  
  info: info-recursive
  
-info-am: $(INFO_DEPS)
+info-am:
  
-install-data-am: install-info-am
+install-data-am:
  
  install-dvi: install-dvi-recursive
  
-install-dvi-am: $(DVIS)
-	@$(NORMAL_INSTALL)
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
-	done
+install-dvi-am:
+
  install-exec-am: install-exec-local install-nodist_toolexeclibHEADERS \
  	install-toolexeclibLTLIBRARIES
  
  install-html: install-html-recursive
  
-install-html-am: $(HTMLS)
-	@$(NORMAL_INSTALL)
-	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__strip_dir) \
-	  d2=$$d$$p; \
-	  if test -d "$$d2"; then \
-	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-	  else \
-	    list2="$$list2 $$d2"; \
-	  fi; \
-	done; \
-	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
-	done; }
+install-html-am:
+
  install-info: install-info-recursive
  
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
-	fi; \
-	for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-	    if test -f $$ifile; then \
-	      echo "$$ifile"; \
-	    else : ; fi; \
-	  done; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
-	@$(POST_INSTALL)
-	@if $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
+install-info-am:
+
  install-man:
  
  install-pdf: install-pdf-recursive
  
-install-pdf-am: $(PDFS)
-	@$(NORMAL_INSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
+install-pdf-am:
+
  install-ps: install-ps-recursive
  
-install-ps-am: $(PSS)
-	@$(NORMAL_INSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+install-ps-am:
+
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
@@ -1046,33 +870,31 @@ maintainer-clean: maintainer-clean-recursive
  	-rm -rf $(top_srcdir)/autom4te.cache
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
  
  mostlyclean: mostlyclean-recursive
  
-mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local
  
  pdf: pdf-recursive
  
-pdf-am: $(PDFS)
+pdf-am:
  
  ps: ps-recursive
  
-ps-am: $(PSS)
+ps-am:
  
-uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
-	uninstall-nodist_toolexeclibHEADERS uninstall-pdf-am \
-	uninstall-ps-am uninstall-toolexeclibLTLIBRARIES
+uninstall-am: uninstall-nodist_toolexeclibHEADERS \
+	uninstall-toolexeclibLTLIBRARIES
  
  .MAKE: $(am__recursive_targets) all install-am install-strip
  
  .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--refresh check check-am clean clean-aminfo clean-cscope \
-	clean-generic clean-libtool clean-local \
-	clean-toolexeclibLTLIBRARIES cscope cscopelist-am ctags \
-	ctags-am dist-info distclean distclean-compile \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool clean-local clean-toolexeclibLTLIBRARIES cscope \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
  	distclean-generic distclean-hdr distclean-libtool \
  	distclean-local distclean-tags dvi dvi-am html html-am info \
  	info-am install install-am install-data install-data-am \
@@ -1082,13 +904,10 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
  	install-pdf install-pdf-am install-ps install-ps-am \
  	install-strip install-toolexeclibLTLIBRARIES installcheck \
  	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-aminfo \
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
  	mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-dvi-am uninstall-html-am \
-	uninstall-info-am uninstall-nodist_toolexeclibHEADERS \
-	uninstall-pdf-am uninstall-ps-am \
+	uninstall-am uninstall-nodist_toolexeclibHEADERS \
  	uninstall-toolexeclibLTLIBRARIES
  
  .PRECIOUS: Makefile
@@ -1109,23 +928,20 @@ vpath % $(strip $(search_path))
  # Make sure -mavx is appended at the end.
  @ARCH_X86_AVX_TRUE@x86_avx.lo : override CXXFLAGS += -mavx
  
-all-local: $(STAMP_GENINSRC)
+all-local: $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  
-RST_FILES:=$(shell find $(srcdir) -name *.rst)
-SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
-SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
-
-export BUGURL=$(PACKAGE_BUGURL)
-
-stamp-geninsrc: doc/info/texinfo/libitm.info
+stamp-geninsrc: libitm.info
  	cp -p $(top_builddir)/libitm.info $(srcdir)/libitm.info
  	@touch $@
  
-doc/info/texinfo/libitm.info: $(SPHINX_FILES)
+libitm.info: $(STAMP_BUILD_INFO)
+
+stamp-build-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); \
+	  cp ./doc/info/texinfo/libitm.info libitm.info; \
  	else true; fi
-
+	@touch $@
  
  # 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/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
index 120696d1c25..0dcba659080 100644
--- a/libitm/testsuite/Makefile.in
+++ b/libitm/testsuite/Makefile.in
@@ -150,6 +150,7 @@ CCASDEPMODE = @CCASDEPMODE@
  CCASFLAGS = @CCASFLAGS@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
+CONFIGURE_SPHINX_BUILD = @CONFIGURE_SPHINX_BUILD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
@@ -168,6 +169,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  FGREP = @FGREP@
  GREP = @GREP@
+HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  HWCAP_LDFLAGS = @HWCAP_LDFLAGS@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
@@ -206,6 +208,7 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
+SPHINX_BUILD = @SPHINX_BUILD@
  STRIP = @STRIP@
  VERSION = @VERSION@
  XCFLAGS = @XCFLAGS@
diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index 35dffb46f6e..c01cdf088b0 100644
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -11,6 +11,8 @@ AM_CFLAGS = $(XCFLAGS)
  ## May be used by toolexeclibdir.
  gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
  
+abs_doc_builddir = @abs_top_builddir@/doc
+
  ## Symbol versioning (copied from libssp).
  if LIBQUAD_USE_SYMVER
  if LIBQUAD_USE_SYMVER_GNU
@@ -138,8 +140,15 @@ stamp-geninsrc: libquadmath.info
  	cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
  	@touch $@
  
-stamp-build-info: libquadmath.texi $(libquadmath_TEXINFOS)
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+
+stamp-build-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); \
+	  cp ./doc/info/texinfo/libquadmath.info libquadmath.info; \
+	else true; fi
  	@touch $@
  
  CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
@@ -147,32 +156,10 @@ MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info
  
  endif BUILD_LIBQUADMATH
  
-all-local: $(ALL_LOCAL_DEPS)
+all-local: $(ALL_LOCAL_DEPS) $(STAMP_BUILD_INFO)
  
  # Unconditionally override this target, so that automake's definition
  # does not wrongly interfere.
  libquadmath.info: $(STAMP_BUILD_INFO)
  
-
-# Automake Documentation:
-# If your package has Texinfo files in many directories, you can use the
-# variable TEXINFO_TEX to tell Automake where to find the canonical
-# `texinfo.tex' for your package. The value of this variable should be
-# the relative path from the current `Makefile.am' to `texinfo.tex'.
-TEXINFO_TEX   = ../gcc/doc/include/texinfo.tex
-
-# Defines info, dvi, pdf and html targets
-MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-
-if BUILD_LIBQUADMATH
-info_TEXINFOS = libquadmath.texi
-else
-info_TEXINFOS =
-endif
-
-libquadmath_TEXINFOS = libquadmath-vers.texi
-
-libquadmath-vers.texi:
-	echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@
-
  include $(top_srcdir)/../multilib.am
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 10e402ccd07..05f21477191 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -143,7 +143,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
-am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" \
+am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
  	"$(DESTDIR)$(libsubincludedir)"
  LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
  am__dirstamp = $(am__leading_dot)dirstamp
@@ -255,9 +255,6 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 =
  SOURCES = $(libquadmath_la_SOURCES)
-INFO_DEPS = doc/info/texinfo/libquadmath.info
-PDFS = doc/pdf/latex/libquadmath.pdf
-HTMLS = doc/html/html/index.html
  am__can_run_installinfo = \
    case $$AM_UPDATE_INFO_DIR in \
      n|no|NO) false;; \
@@ -297,6 +294,7 @@ AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
+CONFIGURE_SPHINX_BUILD = @CONFIGURE_SPHINX_BUILD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CYGPATH_W = @CYGPATH_W@
@@ -311,6 +309,7 @@ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  FGREP = @FGREP@
  GREP = @GREP@
+HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +324,7 @@ LIPO = @LIPO@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
  MKDIR_P = @MKDIR_P@
  NM = @NM@
  NMEDIT = @NMEDIT@
@@ -347,14 +347,12 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SPHINX_BUILD = @SPHINX_BUILD@
-HAS_SPHINX_BUILD = @HAS_SPHINX_BUILD@
  STRIP = @STRIP@
  VERSION = @VERSION@
  XCFLAGS = @XCFLAGS@
  abs_builddir = @abs_builddir@
  abs_srcdir = @abs_srcdir@
  abs_top_builddir = @abs_top_builddir@
-abs_doc_builddir = @abs_top_builddir@/doc
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -420,6 +418,7 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir
  @BUILD_LIBQUADMATH_TRUE@AM_CPPFLAGS = -I $(top_srcdir)/../include
  @BUILD_LIBQUADMATH_TRUE@AM_CFLAGS = $(XCFLAGS)
  @BUILD_LIBQUADMATH_TRUE@gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
+@BUILD_LIBQUADMATH_TRUE@abs_doc_builddir = @abs_top_builddir@/doc
  @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_FALSE@version_arg =
  @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_GNU_TRUE@@LIBQUAD_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/quadmath.map
  @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@version_arg = -Wl,-M,quadmath.map-sun
@@ -483,6 +482,7 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir
  @BUILD_LIBQUADMATH_TRUE@	"LIBCFLAGS=$(LIBCFLAGS)" \
  @BUILD_LIBQUADMATH_TRUE@	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
  @BUILD_LIBQUADMATH_TRUE@	"MAKE=$(MAKE)" \
+@BUILD_LIBQUADMATH_TRUE@	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
  @BUILD_LIBQUADMATH_TRUE@	"PICFLAG=$(PICFLAG)" \
  @BUILD_LIBQUADMATH_TRUE@	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
  @BUILD_LIBQUADMATH_TRUE@	"SHELL=$(SHELL)" \
@@ -516,17 +516,11 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE@@BUILD_LIBQUADMATH_TRUE@STAMP_BUILD_INFO = stamp-build-info
+@BUILD_LIBQUADMATH_TRUE@RST_FILES := $(shell find $(srcdir) -name *.rst)
+@BUILD_LIBQUADMATH_TRUE@SPHINX_CONFIG_FILES := $(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+@BUILD_LIBQUADMATH_TRUE@SPHINX_FILES := $(RST_FILES) $(SPHINX_CONFIG_FILES)
  @BUILD_LIBQUADMATH_TRUE@CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO)
  @BUILD_LIBQUADMATH_TRUE@MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info
-
-# Automake Documentation:
-# If your package has Texinfo files in many directories, you can use the
-# variable TEXINFO_TEX to tell Automake where to find the canonical
-# `texinfo.tex' for your package. The value of this variable should be
-# the relative path from the current `Makefile.am' to `texinfo.tex'.
-TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
-
-# Defines info, dvi, pdf and html targets
  MULTISRCTOP =
  MULTIBUILDTOP =
  MULTIDIRS =
@@ -537,7 +531,7 @@ all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
  .SUFFIXES:
-.SUFFIXES: .c .dvi .lo .o .obj .ps
+.SUFFIXES: .c .lo .o .obj
  am--refresh: Makefile
  	@:
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(am__configure_deps)
@@ -950,93 +944,6 @@ clean-libtool:
  
  distclean-libtool:
  	-rm -f libtool config.lt
-
-doc/pdf/latex/libquadmath.pdf: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
-
-doc/html/html/index.html: $(SPHINX_FILES)
-	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
-
-uninstall-html-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
-	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
-	done
-
-uninstall-info-am:
-	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-	    then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
-	  done; \
-	else :; fi
-	@$(NORMAL_UNINSTALL)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-	   else :; fi); \
-	done
-
-uninstall-pdf-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
-	done
-
-uninstall-ps-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
-	done
-
-dist-info: $(INFO_DEPS)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  case $$base in \
-	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-	    if test -f $$file; then \
-	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	      test -f "$(distdir)/$$relfile" || \
-		cp -p $$file "$(distdir)/$$relfile"; \
-	    else :; fi; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -rf libquadmath.t2d libquadmath.t2p
-
-clean-aminfo:
-	-test -z "libquadmath.dvi libquadmath.pdf libquadmath.ps libquadmath.html" \
-	|| rm -rf libquadmath.dvi libquadmath.pdf libquadmath.ps libquadmath.html
-
-maintainer-clean-aminfo:
-	@list='$(INFO_DEPS)'; for i in $$list; do \
-	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-	done
  install-nodist_libsubincludeHEADERS: $(nodist_libsubinclude_HEADERS)
  	@$(NORMAL_INSTALL)
  	@list='$(nodist_libsubinclude_HEADERS)'; test -n "$(libsubincludedir)" || list=; \
@@ -1119,10 +1026,9 @@ distclean-tags:
  	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
  check-am: all-am
  check: check-am
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h \
-		all-local
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-local
  installdirs:
-	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(libsubincludedir)"; do \
+	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(libsubincludedir)"; do \
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
@@ -1165,7 +1071,7 @@ maintainer-clean-generic:
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  clean: clean-am
  
-clean-am: clean-aminfo clean-generic clean-libtool clean-local \
+clean-am: clean-generic clean-libtool clean-local \
  	clean-toolexeclibLTLIBRARIES mostlyclean-am
  
  distclean: distclean-am
@@ -1177,133 +1083,42 @@ distclean-am: clean-am distclean-compile distclean-generic \
  
  dvi: dvi-am
  
-dvi-am: $(DVIS)
+dvi-am:
  
  html: html-am
  
-html-am: $(HTMLS)
+html-am:
  
  info: info-am
  
-info-am: $(INFO_DEPS)
+info-am:
  
-install-data-am: install-info-am install-nodist_libsubincludeHEADERS
+install-data-am: install-nodist_libsubincludeHEADERS
  
  install-dvi: install-dvi-am
  
-install-dvi-am: $(DVIS)
-	@$(NORMAL_INSTALL)
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
-	done
+install-dvi-am:
+
  install-exec-am: install-exec-local install-toolexeclibLTLIBRARIES
  
  install-html: install-html-am
  
-install-html-am: $(HTMLS)
-	@$(NORMAL_INSTALL)
-	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__strip_dir) \
-	  d2=$$d$$p; \
-	  if test -d "$$d2"; then \
-	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-	  else \
-	    list2="$$list2 $$d2"; \
-	  fi; \
-	done; \
-	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
-	done; }
+install-html-am:
+
  install-info: install-info-am
  
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
-	fi; \
-	for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-	    if test -f $$ifile; then \
-	      echo "$$ifile"; \
-	    else : ; fi; \
-	  done; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
-	@$(POST_INSTALL)
-	@if $(am__can_run_installinfo); then \
-	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
+install-info-am:
+
  install-man:
  
  install-pdf: install-pdf-am
  
-install-pdf-am: $(PDFS)
-	@$(NORMAL_INSTALL)
-	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
+install-pdf-am:
+
  install-ps: install-ps-am
  
-install-ps-am: $(PSS)
-	@$(NORMAL_INSTALL)
-	@list='$(PSS)'; test -n "$(psdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+install-ps-am:
+
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
@@ -1311,49 +1126,45 @@ maintainer-clean: maintainer-clean-am
  	-rm -rf $(top_srcdir)/autom4te.cache
  	-rm -rf math/$(DEPDIR) printf/$(DEPDIR) strtod/$(DEPDIR)
  	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
  
  mostlyclean: mostlyclean-am
  
-mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local
  
  pdf: pdf-am
  
-pdf-am: $(PDFS)
+pdf-am:
  
  ps: ps-am
  
-ps-am: $(PSS)
+ps-am:
  
-uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
-	uninstall-nodist_libsubincludeHEADERS uninstall-pdf-am \
-	uninstall-ps-am uninstall-toolexeclibLTLIBRARIES
+uninstall-am: uninstall-nodist_libsubincludeHEADERS \
+	uninstall-toolexeclibLTLIBRARIES
  
  .MAKE: all install-am install-strip
  
  .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
-	check-am clean clean-aminfo clean-cscope clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES cscope \
-	cscopelist-am ctags ctags-am dist-info distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-local distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
+	check-am clean clean-cscope clean-generic clean-libtool \
+	clean-local clean-toolexeclibLTLIBRARIES cscope cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-local distclean-tags \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
  	install-html-am install-info install-info-am install-man \
  	install-nodist_libsubincludeHEADERS install-pdf install-pdf-am \
  	install-ps install-ps-am install-strip \
  	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-dvi-am \
-	uninstall-html-am uninstall-info-am \
-	uninstall-nodist_libsubincludeHEADERS uninstall-pdf-am \
-	uninstall-ps-am uninstall-toolexeclibLTLIBRARIES
+	installdirs maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-nodist_libsubincludeHEADERS \
+	uninstall-toolexeclibLTLIBRARIES
  
  .PRECIOUS: Makefile
  
@@ -1366,18 +1177,22 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
  @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@	   sed 's,\([^/ 	]*\)\.l\([ao]\),.libs/\1.\2,g'` \
  @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@	 > $@ || (rm -f $@ ; exit 1)
  
-all-local: $(ALL_LOCAL_DEPS)
+@BUILD_LIBQUADMATH_TRUE@stamp-geninsrc: libquadmath.info
+@BUILD_LIBQUADMATH_TRUE@	cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
+@BUILD_LIBQUADMATH_TRUE@	@touch $@
  
-RST_FILES:=$(shell find $(srcdir) -name *.rst)
-SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
-SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+@BUILD_LIBQUADMATH_TRUE@stamp-build-info: $(SPHINX_FILES)
+@BUILD_LIBQUADMATH_TRUE@	+ if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
+@BUILD_LIBQUADMATH_TRUE@	  make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
+@BUILD_LIBQUADMATH_TRUE@	  cp ./doc/info/texinfo/libquadmath.info libquadmath.info; \
+@BUILD_LIBQUADMATH_TRUE@	else true; fi
+@BUILD_LIBQUADMATH_TRUE@	@touch $@
  
-export BUGURL=$(REPORT_BUGS_TO)
+all-local: $(ALL_LOCAL_DEPS) $(STAMP_BUILD_INFO)
  
-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
+# Unconditionally override this target, so that automake's definition
+# does not wrongly interfere.
+libquadmath.info: $(STAMP_BUILD_INFO)
  
  # GNU Make needs to see an explicit $(MAKE) variable in the command it
  # runs to enable its job server during parallel builds.  Hence the
