summaryrefslogtreecommitdiff
path: root/libquadmath
diff options
context:
space:
mode:
authorfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-09 07:40:39 +0000
committerfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-09 07:40:39 +0000
commitacafca510c97652f1fc3cf9dbe0586aa8428aeea (patch)
treec7839bdb4ce2b197c4fea1f7fa29ffd1d72ebd30 /libquadmath
parent1b4aaefc8c1a1662e1623cd48157c344c7fa98fe (diff)
downloadgcc-acafca510c97652f1fc3cf9dbe0586aa8428aeea.tar.gz
PR libquadmath/55821
* Makefile.am: Conditionally define info_TEXINFOS and libquadmath_TEXINFOS. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216027 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libquadmath')
-rw-r--r--libquadmath/ChangeLog7
-rw-r--r--libquadmath/Makefile.am6
-rw-r--r--libquadmath/Makefile.in8
3 files changed, 18 insertions, 3 deletions
diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index fadafe076da..76bcc8c7690 100644
--- 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 6519731b9b9..dbf6a186f06 100644
--- 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 331780931af..b21b2b71459 100644
--- 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