re PR libquadmath/55821 (Release tarballs (unconditionally) install libquadmath.info...

	PR libquadmath/55821
	* Makefile.am: Conditionally define info_TEXINFOS and
	libquadmath_TEXINFOS.
	* Makefile.in: Regenerate.

From-SVN: r216027

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index fadafe076da4612b8e19a098b61ce0d89061fa1e..76bcc8c76904179e954a3f9ff5a11f92f39301a6 100644 (file)
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-09  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       PR libquadmath/55821
+       * Makefile.am: Conditionally define info_TEXINFOS and
+       libquadmath_TEXINFOS.
+       * Makefile.in: Regenerate.
+
 2014-10-08  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR libquadmath/63487

diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index 6519731b9b9e42763c922507434f9aa2551ed6bc..dbf6a186f06d6687cc53597bc5daae0319c43de3 100644 (file)
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -160,8 +160,14 @@ 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
 libquadmath_TEXINFOS = libquadmath-vers.texi
+else
+info_TEXINFOS = 
+libquadmath_TEXINFOS = 
+endif
 
 libquadmath-vers.texi:
        echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 331780931af072badaee8a5080d57edc46334dc9..b21b2b714599b50bf3dd42501e1ed56b2dc63951 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -175,7 +175,7 @@ DVIS = libquadmath.dvi
 PDFS = libquadmath.pdf
 PSS = libquadmath.ps
 HTMLS = libquadmath.html
-TEXINFOS = libquadmath.texi
+TEXINFOS =
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -418,8 +418,10 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 
 # Defines info, dvi, pdf and html targets
 MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-info_TEXINFOS = libquadmath.texi
-libquadmath_TEXINFOS = libquadmath-vers.texi
+@BUILD_LIBQUADMATH_FALSE@info_TEXINFOS = 
+@BUILD_LIBQUADMATH_TRUE@info_TEXINFOS = libquadmath.texi
+@BUILD_LIBQUADMATH_FALSE@libquadmath_TEXINFOS = 
+@BUILD_LIBQUADMATH_TRUE@libquadmath_TEXINFOS = libquadmath-vers.texi
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am