[rtems-crossrpms commit] More automake-1.12 changes.

[Ralf Corsepius]

Module:    rtems-crossrpms
Branch:    master
Commit:    af5784ef1688fc819df4fe2c92e751d36e9f4720
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=af5784ef1688fc819df4fe2c92e751d36e9f4720

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Jul 18 13:54:03 2012 +0200

More automake-1.12 changes.

---

 autotools/automake.add             |    6 +++---
 autotools/rtems-4.11-automake.spec |    8 ++++----
 autotools/target-automake.add      |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/autotools/automake.add b/autotools/automake.add
index 5669cae..697bae1 100644
--- a/autotools/automake.add
+++ b/autotools/automake.add
@@ -1,6 +1,6 @@
-%define rpmvers @AUTOMAKE_VERS@
-%define srcvers	@AUTOMAKE_VERS@
-%define amvers  1.11
+%global rpmvers @AUTOMAKE_VERS@
+%global srcvers	@AUTOMAKE_VERS@
+%global amvers  1.12
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix at automake
diff --git a/autotools/rtems-4.11-automake.spec b/autotools/rtems-4.11-automake.spec
index 863fbce..459f414 100644
--- a/autotools/rtems-4.11-automake.spec
+++ b/autotools/rtems-4.11-automake.spec
@@ -45,9 +45,9 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define rpmvers 1.12.2
-%define srcvers	1.12.2
-%define amvers  1.11
+%global rpmvers 1.12.2
+%global srcvers	1.12.2
+%global amvers  1.12
 
 %define name			rtems-4.11-automake
 %define requirements		rtems-4.11-autoconf >= 2.61
@@ -195,7 +195,7 @@ fi
 %{_bindir}/automake*
 %dir %{_infodir}
 %ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
+%{_infodir}/automake*.info*.gz
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/*
diff --git a/autotools/target-automake.add b/autotools/target-automake.add
index 4658da4..40fd498 100644
--- a/autotools/target-automake.add
+++ b/autotools/target-automake.add
@@ -14,7 +14,7 @@ fi
 %{_bindir}/automake*
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
+%{_infodir}/automake*.info*.gz
 %sysdir %{_mandir}
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/*