From 0f01f7406b842ab8ebcffb2907889f67c1d3d94e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Tue, 21 Oct 2014 08:59:17 +0000 Subject: [PATCH] re PR libquadmath/55821 (Release tarballs (unconditionally) install libquadmath.info when libquadmath is not supported) PR libquadmath/55821 * Makefile.am: Unconditionally define libquadmath_TEXINFOS. * Makefile.in: Regenerate. From-SVN: r216503 --- libquadmath/ChangeLog | 6 ++++++ libquadmath/Makefile.am | 4 ++-- libquadmath/Makefile.in | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog index 76bcc8c7690..f2b96bc32e1 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,9 @@ +2014-10-21 Francois-Xavier Coudert + + PR libquadmath/55821 + * Makefile.am: Unconditionally define libquadmath_TEXINFOS. + * Makefile.in: Regenerate. + 2014-10-09 Francois-Xavier Coudert PR libquadmath/55821 diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am index dbf6a186f06..145fb38fc24 100644 --- 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 b21b2b71459..5ac6b40f8ca 100644 --- 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 -- 2.30.2