From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu, 5 Dec 2013 04:04:58 +0000 (+0530)
Subject: BZ #15941: Fix INSTALL file regeneration failure with makeinfo 5.x
X-Git-Tag: glibc-2.19~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d136c6dc;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 3b5be238f7d..e590d1b607e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* stdlib/longlong.h: Update from GCC.
diff --git a/Makefile b/Makefile
index ccba09a6ad6..1998756df73 100644
--- a/Makefile
+++ b/Makefile
@@ -377,8 +377,8 @@ dist: dist-prepare
 	fi
 endif
 
-INSTALL: manual/install.texi manual/macros.texi \
-	 $(common-objpfx)manual/pkgvers.texi
+INSTALL: manual/install-plain.texi manual/macros.texi \
+	 $(common-objpfx)manual/pkgvers.texi manual/install.texi
 	makeinfo --no-validate --plaintext --no-number-sections \
 		 -I$(common-objpfx)manual $< -o $@-tmp
 	$(AWK) 'NF == 0 { ++n; next } \
diff --git a/NEWS b/NEWS
index 0f97ce70d4d..56dbb0d4c34 100644
--- a/NEWS
+++ b/NEWS
@@ -17,11 +17,11 @@ Version 2.19
   15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760,
   15763, 15764, 15797, 15799, 15825, 15844, 15847, 15849, 15855, 15856,
   15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897,
-  15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939, 15948,
-  15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037, 16038,
-  16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112, 16143,
-  16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214, 16245,
-  16271, 16274, 16283, 16289.
+  15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923, 15939, 15941,
+  15948, 15963, 15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037,
+  16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112,
+  16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214,
+  16245, 16271, 16274, 16283, 16289.
 
 * The public headers no longer use __unused nor __block.  This change is to
   support compiling programs that are derived from BSD sources and use
diff --git a/manual/install-plain.texi b/manual/install-plain.texi
new file mode 100644
index 00000000000..c5179e780c1
--- /dev/null
+++ b/manual/install-plain.texi
@@ -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
diff --git a/manual/install.texi b/manual/install.texi
index aaf27c9e4a3..535dc19147b 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -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 pkgvers.texi
 
+@ifclear plain
 @node Installation, Maintenance, Library Summary, Top
+@end ifclear
+
 @c %MENU% How to install the GNU C Library
 @appendix Installing @theglibc{}