From b42cae739ffd54fa3331841ed86a9f81995d92ef Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 4 Mar 2011 16:22:17 +0000
Subject: =?UTF-8?q?2011-03-04=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
	aclocal/version.m4: Rename RTEMS_API into _RTEMS_API.
---
 ChangeLog            | 5 +++++
 Makefile.maint       | 2 +-
 aclocal/rpm.m4       | 8 ++++----
 aclocal/rtems-top.m4 | 2 +-
 aclocal/version.m4   | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e89affcf88..bf6fe2456d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
+	aclocal/version.m4: Rename RTEMS_API into _RTEMS_API.
+
 2011-03-03	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bootstrap: Add -g option.
diff --git a/Makefile.maint b/Makefile.maint
index c25c86bb72..d4f037ac8f 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -145,7 +145,7 @@ new-branch:
 	api="$$v.$$(($$r + 1))"; \
 	echo "New branch release: $$version"; \
 	sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
-	  -e "s|\[RTEMS_API\],\[.*\]|\[RTEMS_API\],\[$$api\]|" \
+	  -e "s|\[_RTEMS_API\],\[.*\]|\[_RTEMS_API\],\[$$api\]|" \
 	  $(VERSION_FILES); \
 	sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
 
diff --git a/aclocal/rpm.m4 b/aclocal/rpm.m4
index a1d16dcb78..1f2015b4a5 100644
--- a/aclocal/rpm.m4
+++ b/aclocal/rpm.m4
@@ -2,19 +2,19 @@ AC_DEFUN([RTEMS_ENABLE_RPMPREFIX],[
 AC_ARG_ENABLE([rpmprefix],
 [  --enable-rpmprefix=<rpmprefix>      prefix rpms],
 [case $enable_rpmprefix in
-yes ) rpmprefix="rtems-"]RTEMS_API["-";;
+yes ) rpmprefix="rtems-"]_RTEMS_API["-";;
 no ) rpmprefix="%{nil}";;
 * ) AS_IF([test -z "$enable_rpmprefix"],
       [rpmprefix="%{nil}"],
       [rpmprefix="$enable_rpmprefix"]);;
 esac],
-[rpmprefix="rtems-"]RTEMS_API["-"])
+[rpmprefix="rtems-"]_RTEMS_API["-"])
 
 AC_ARG_ENABLE([osversions],
 [  --enable-osversions       whether to use version numbers in os-tripples],
 [case $enable_osversions in
-yes ) osversion=RTEMS_API;;
+yes ) osversion=_RTEMS_API;;
 * ) osversion=;;
 esac],
-[osversion=RTEMS_API])
+[osversion=_RTEMS_API])
 ])
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 8c76f89682..147455c04b 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -16,7 +16,7 @@ AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
 
 RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
diff --git a/aclocal/version.m4 b/aclocal/version.m4
index edd18b04a2..6ca81ac661 100644
--- a/aclocal/version.m4
+++ b/aclocal/version.m4
@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
 m4_define([_RTEMS_VERSION],[4.10.99.0]))
 
-m4_define([RTEMS_API],[4.11])
+m4_define([_RTEMS_API],[4.11])
-- 
cgit v1.2.3