git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libquadmath/55821 (Release tarballs (unconditionally) install libquadmath.info when libquadmath is not supported) 

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

From-SVN: r216027
This commit is contained in:
Francois-Xavier Coudert 2014-10-09 07:40:39 +00:00 committed by François-Xavier Coudert
parent 58a41b43b5
commit 9d55066c88
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libquadmath/ChangeLog
View File

@ -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> 2014-10-08 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR libquadmath/63487 PR libquadmath/63487

6
libquadmath/Makefile.am
View File

@ -160,8 +160,14 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
# Defines info, dvi, pdf and html targets # Defines info, dvi, pdf and html targets
MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
if BUILD_LIBQUADMATH
info_TEXINFOS = libquadmath.texi info_TEXINFOS = libquadmath.texi
libquadmath_TEXINFOS = libquadmath-vers.texi libquadmath_TEXINFOS = libquadmath-vers.texi
else
info_TEXINFOS =
libquadmath_TEXINFOS =
endif
libquadmath-vers.texi: libquadmath-vers.texi:
echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@ echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@

8
libquadmath/Makefile.in
View File

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