aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-02-24 21:32:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-24 21:32:58 +0000
commit66ab80bca6c1d616fe937ff64ea80d1ba08ec559 (patch)
treedd456a30b5a1406fc28b275fcd1454dedc576881
parentee968201e7f0eb5dc2ebc7ebd7393ac0c12675ea (diff)
downloadglibc-66ab80bca6c1d616fe937ff64ea80d1ba08ec559.zip
glibc-66ab80bca6c1d616fe937ff64ea80d1ba08ec559.tar.gz
glibc-66ab80bca6c1d616fe937ff64ea80d1ba08ec559.tar.bz2
Update makefile for FDL 1.3 change.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--manual/Makefile4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8773c8a..021a078 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 8dfa971..82d32c9 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 6959dd2..df96abc 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)