From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 24 Feb 2012 21:32:58 +0000 (+0000)
Subject: Update makefile for FDL 1.3 change.
X-Git-Tag: glibc-2.16-tps~951
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66ab80bca6c1d616fe937ff64ea80d1ba08ec559;p=thirdparty%2Fglibc.git

Update makefile for FDL 1.3 change.
---

diff --git a/ChangeLog b/ChangeLog
index 8773c8ae245..021a078e44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* manual/Makefile (licenses): Change fdl-1.1.texi to fdl-1.3.texi.
+
 2012-02-24  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #13738]
diff --git a/NEWS b/NEWS
index 8dfa97100fc..82d32c9c3f6 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Version 2.16
   6884, 6907, 9739, 9902, 10110, 10140, 10210, 11174, 11322, 11365, 11494,
   12047, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532,
   13533, 13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618, 13695,
-  13704
+  13704, 13738
 
 * ISO C11 support:
 
diff --git a/manual/Makefile b/manual/Makefile
index 6959dd24c2b..df96abcafb3 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006,2011
+# Copyright (C) 1992-2012
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -59,7 +59,7 @@ chapters = $(addsuffix .texi, \
 		       users sysinfo conf crypt debug)
 add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
 appendices = lang.texi header.texi install.texi maint.texi contrib.texi
-licenses = freemanuals.texi lgpl-2.1.texi fdl-1.1.texi
+licenses = freemanuals.texi lgpl-2.1.texi fdl-1.3.texi
 
 -include texis
 texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses)