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

	PR libquadmath/55821
	* Makefile.am: Unconditionally define libquadmath_TEXINFOS.
	* Makefile.in: Regenerate.

From-SVN: r216503

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

diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index dbf6a186f06d6687cc53597bc5daae0319c43de3..145fb38fc2471b4a44c37a7eca926227455e9e3f 100644 (file)
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -163,11 +163,11 @@ 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_TEXINFOS = libquadmath-vers.texi
+
 libquadmath-vers.texi:
        echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index b21b2b714599b50bf3dd42501e1ed56b2dc63951..5ac6b40f8ca218c3257ff4bb20d19d3997a3d7ac 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -420,8 +420,7 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
 @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
+libquadmath_TEXINFOS = libquadmath-vers.texi
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am