summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/Makefile.am2
-rw-r--r--bfd/Makefile.in2
-rwxr-xr-xbfd/configure2
-rw-r--r--bfd/configure.in2
5 files changed, 10 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f137705b10c..65db027c8d5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-21 Tristan Gingold <gingold@adacore.com>
+
+ * configure.in: Bump version to 2.22
+ * Makefile.am (RELEASE): Set.
+ * configure, Makefile.in: Regenerate.
+
2011-11-15 Maxim Kuvyrkov <maxim@codesourcery.com>
Backport from mainline:
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 8610d5e361f..ea4fd284a2c 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
# Uncomment the following line when doing a release.
-# RELEASE=y
+RELEASE=y
INCDIR = $(srcdir)/../include
CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 34196aa9b8e..741809c98eb 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -320,7 +320,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
# Uncomment the following line when doing a release.
-# RELEASE=y
+RELEASE = y
INCDIR = $(srcdir)/../include
CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
SUBDIRS = doc po
diff --git a/bfd/configure b/bfd/configure
index 2957f864af1..bc242b9956f 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -3988,7 +3988,7 @@ fi
# Define the identity of the package.
PACKAGE=bfd
- VERSION=2.21.90
+ VERSION=2.22
cat >>confdefs.h <<_ACEOF
diff --git a/bfd/configure.in b/bfd/configure.in
index bc28f9bbef8..435aaaa1ceb 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c])
AC_CANONICAL_TARGET
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(bfd, 2.21.90)
+AM_INIT_AUTOMAKE(bfd, 2.22)
dnl These must be called before LT_INIT, because it may want
dnl to call AC_CHECK_PROG.