BZ #15941: Fix INSTALL file regeneration failure with makeinfo 5.x

I have skipped regenerating the INSTALL file because we want to
continue using the 4.x generator for now.
This commit is contained in:
Siddhesh Poyarekar 2013-12-05 09:34:58 +05:30
parent ab07cea8bb
commit d136c6dc1e
5 changed files with 24 additions and 10 deletions

View File

@ -1,3 +1,12 @@
2013-12-05 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #15941]
* Makefile (INSTALL): Add install-plain.texi as the primary
dependency.
* manual/install-plain.texi: New file.
* manual/install.texi: Include node directive only for
non-plaintext output.
2013-12-04 Joseph Myers <joseph@codesourcery.com> 2013-12-04 Joseph Myers <joseph@codesourcery.com>
* stdlib/longlong.h: Update from GCC. * stdlib/longlong.h: Update from GCC.

View File

@ -377,8 +377,8 @@ dist: dist-prepare
fi fi
endif endif
INSTALL: manual/install.texi manual/macros.texi \ INSTALL: manual/install-plain.texi manual/macros.texi \
$(common-objpfx)manual/pkgvers.texi $(common-objpfx)manual/pkgvers.texi manual/install.texi
makeinfo --no-validate --plaintext --no-number-sections \ makeinfo --no-validate --plaintext --no-number-sections \
-I$(common-objpfx)manual $< -o $@-tmp -I$(common-objpfx)manual $< -o $@-tmp
$(AWK) 'NF == 0 { ++n; next } \ $(AWK) 'NF == 0 { ++n; next } \

10
NEWS
View File

@ -17,11 +17,11 @@ Version 2.19
15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760,
15763, 15764, 15797, 15799, 15825, 15844, 15847, 15849, 15855, 15856, 15763, 15764, 15797, 15799, 15825, 15844, 15847, 15849, 15855, 15856,
15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897,
15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939, 15948, 15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939, 15941,
15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037, 16038, 15948, 15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037,
16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112, 16143, 16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112,
16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214, 16245, 16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214,
16271, 16274, 16283, 16289. 16245, 16271, 16274, 16283, 16289.
* The public headers no longer use __unused nor __block. This change is to * The public headers no longer use __unused nor __block. This change is to
support compiling programs that are derived from BSD sources and use support compiling programs that are derived from BSD sources and use

View File

@ -0,0 +1,5 @@
@c This is for making the `INSTALL' file for the distribution.
@c Makeinfo ignores it when processing the file from the include.
@setfilename INSTALL
@set plain
@include install.texi

View File

@ -1,10 +1,10 @@
@c This is for making the `INSTALL' file for the distribution.
@c Makeinfo ignores it when processing the file from the include.
@setfilename INSTALL
@include macros.texi @include macros.texi
@include pkgvers.texi @include pkgvers.texi
@ifclear plain
@node Installation, Maintenance, Library Summary, Top @node Installation, Maintenance, Library Summary, Top
@end ifclear
@c %MENU% How to install the GNU C Library @c %MENU% How to install the GNU C Library
@appendix Installing @theglibc{} @appendix Installing @theglibc{}