<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-03-04)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
* shared/start/start.S: Remove conflict markers in comment.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ChangeLog.diff?r1=text&tr1=1.233.2.4&r2=text&tr2=1.233.2.5&diff_format=h">M</a></td><td width='1%'>1.233.2.5</td><td width='100%'>c/src/lib/libbsp/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/start/start.S.diff?r1=text&tr1=1.26&r2=text&tr2=1.26.2.1&diff_format=h">M</a></td><td width='1%'>1.26.2.1</td><td width='100%'>c/src/lib/libbsp/powerpc/shared/start/start.S</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.4 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.5
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.4 Wed Feb 2 09:16:28 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Fri Mar 4 10:56:23 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * shared/start/start.S: Remove conflict markers in comment.
+
</font> 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26 rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26.2.1
--- rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26 Tue Dec 1 19:51:22 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/start/start.S Fri Mar 4 10:56:23 2011
</font><font color='#997700'>@@ -7,12 +7,7 @@
</font> * found in found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
<font color='#880000'>-<<<<<<< start.S
</font> * $Id$
<font color='#880000'>-=======
- * $Id$
->>>>>>> 1.25
- *
</font> */
#include <rtems/asm.h>
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/env-rtemsbsp.m4, aclocal/rtems-top.m4, aclocal/version.m4:
Rename RTEMS_API into _RTEMS_API.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/ChangeLog.diff?r1=text&tr1=1.179&r2=text&tr2=1.180&diff_format=h">M</a></td><td width='1%'>1.180</td><td width='100%'>testsuites/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/aclocal/env-rtemsbsp.m4.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>testsuites/aclocal/env-rtemsbsp.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/aclocal/rtems-top.m4.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>testsuites/aclocal/rtems-top.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/aclocal/version.m4.diff?r1=text&tr1=1.15&r2=text&tr2=1.16&diff_format=h">M</a></td><td width='1%'>1.16</td><td width='100%'>testsuites/aclocal/version.m4</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/ChangeLog:1.179 rtems/testsuites/ChangeLog:1.180
--- rtems/testsuites/ChangeLog:1.179 Fri Feb 25 00:17:36 2011
+++ rtems/testsuites/ChangeLog Fri Mar 4 10:14:42 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/env-rtemsbsp.m4, aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
</font> 2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/canonical-target-name.m4:
<font color='#006600'>diff -u rtems/testsuites/aclocal/env-rtemsbsp.m4:1.14 rtems/testsuites/aclocal/env-rtemsbsp.m4:1.15
--- rtems/testsuites/aclocal/env-rtemsbsp.m4:1.14 Tue Nov 22 09:32:03 2005
+++ rtems/testsuites/aclocal/env-rtemsbsp.m4 Fri Mar 4 10:14:42 2011
</font><font color='#997700'>@@ -27,5 +27,5 @@
</font> AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
<font color='#880000'>-AC_SUBST([rtems_testsdir],["\$(libdir)/rtems-][RTEMS_API][/tests"])
</font><font color='#000088'>+AC_SUBST([rtems_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/tests"])
</font> ])
<font color='#006600'>diff -u rtems/testsuites/aclocal/rtems-top.m4:1.14 rtems/testsuites/aclocal/rtems-top.m4:1.15
--- rtems/testsuites/aclocal/rtems-top.m4:1.14 Tue Jul 1 21:19:10 2008
+++ rtems/testsuites/aclocal/rtems-top.m4 Fri Mar 4 10:14:42 2011
</font><font color='#997700'>@@ -17,7 +17,7 @@
</font> AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
<font color='#880000'>-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
</font><font color='#000088'>+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
</font>
## HACK to allow gnu-make conditionals in automake-Makefiles.
ENDIF=endif
<font color='#006600'>diff -u rtems/testsuites/aclocal/version.m4:1.15 rtems/testsuites/aclocal/version.m4:1.16
--- rtems/testsuites/aclocal/version.m4:1.15 Mon Jun 7 14:32:44 2010
+++ rtems/testsuites/aclocal/version.m4 Fri Mar 4 10:14:42 2011
</font><font color='#997700'>@@ -1,4 +1,4 @@
</font> AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
<font color='#880000'>-m4_define([RTEMS_API],[4.11])
</font><font color='#000088'>+m4_define([_RTEMS_API],[4.11])
</font></pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/rtems-top.m4, aclocal/version.m4:
Rename RTEMS_API into _RTEMS_API.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/ChangeLog.diff?r1=text&tr1=1.544&r2=text&tr2=1.545&diff_format=h">M</a></td><td width='1%'>1.545</td><td width='100%'>c/src/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/aclocal/rtems-top.m4.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>c/src/aclocal/rtems-top.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/aclocal/version.m4.diff?r1=text&tr1=1.15&r2=text&tr2=1.16&diff_format=h">M</a></td><td width='1%'>1.16</td><td width='100%'>c/src/aclocal/version.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2761&r2=text&tr2=1.2762&diff_format=h">M</a></td><td width='1%'>1.2762</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/aclocal/rtems-top.m4.diff?r1=text&tr1=1.22&r2=text&tr2=1.23&diff_format=h">M</a></td><td width='1%'>1.23</td><td width='100%'>cpukit/aclocal/rtems-top.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/aclocal/version.m4.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>cpukit/aclocal/version.m4</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ChangeLog:1.544 rtems/c/src/ChangeLog:1.545
--- rtems/c/src/ChangeLog:1.544 Fri Feb 25 00:13:14 2011
+++ rtems/c/src/ChangeLog Fri Mar 4 10:17:27 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
</font> 2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/canonical-target-name.m4:
<font color='#006600'>diff -u rtems/c/src/aclocal/rtems-top.m4:1.14 rtems/c/src/aclocal/rtems-top.m4:1.15
--- rtems/c/src/aclocal/rtems-top.m4:1.14 Sun Jun 29 01:27:06 2008
+++ rtems/c/src/aclocal/rtems-top.m4 Fri Mar 4 10:17:27 2011
</font><font color='#997700'>@@ -17,7 +17,7 @@
</font> AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
<font color='#880000'>-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
</font><font color='#000088'>+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
</font>
AC_SUBST([RTEMS_TOPdir],["$1"])
<font color='#006600'>diff -u rtems/c/src/aclocal/version.m4:1.15 rtems/c/src/aclocal/version.m4:1.16
--- rtems/c/src/aclocal/version.m4:1.15 Mon Jun 7 14:33:09 2010
+++ rtems/c/src/aclocal/version.m4 Fri Mar 4 10:17:27 2011
</font><font color='#997700'>@@ -1,4 +1,4 @@
</font> AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
<font color='#880000'>-m4_define([RTEMS_API],[4.11])
</font><font color='#000088'>+m4_define([_RTEMS_API],[4.11])
</font>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2761 rtems/cpukit/ChangeLog:1.2762
--- rtems/cpukit/ChangeLog:1.2761 Thu Mar 3 10:01:34 2011
+++ rtems/cpukit/ChangeLog Fri Mar 4 10:16:15 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
</font> 2011-03-03 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h: Typos.
<font color='#006600'>diff -u rtems/cpukit/aclocal/rtems-top.m4:1.22 rtems/cpukit/aclocal/rtems-top.m4:1.23
--- rtems/cpukit/aclocal/rtems-top.m4:1.22 Mon Jun 30 03:54:41 2008
+++ rtems/cpukit/aclocal/rtems-top.m4 Fri Mar 4 10:16:16 2011
</font><font color='#997700'>@@ -17,7 +17,7 @@
</font> AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
<font color='#880000'>-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
</font><font color='#000088'>+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
</font>
AC_SUBST([RTEMS_TOPdir],["$1"])
<font color='#006600'>diff -u rtems/cpukit/aclocal/version.m4:1.26 rtems/cpukit/aclocal/version.m4:1.27
--- rtems/cpukit/aclocal/version.m4:1.26 Mon Jun 7 14:33:37 2010
+++ rtems/cpukit/aclocal/version.m4 Fri Mar 4 10:16:17 2011
</font><font color='#997700'>@@ -1,4 +1,4 @@
</font> AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
<font color='#880000'>-m4_define([RTEMS_API],[4.11])
</font><font color='#000088'>+m4_define([_RTEMS_API],[4.11])
</font></pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Rename RTEMS_API into _RTEMS_API.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/ada-tests/ChangeLog.diff?r1=text&tr1=1.85&r2=text&tr2=1.86&diff_format=h">M</a></td><td width='1%'>1.86</td><td width='100%'>c/src/ada-tests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/ada-tests/configure.ac.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>c/src/ada-tests/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/doc/ChangeLog.diff?r1=text&tr1=1.299&r2=text&tr2=1.300&diff_format=h">M</a></td><td width='1%'>1.300</td><td width='100%'>doc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/doc/configure.ac.diff?r1=text&tr1=1.33&r2=text&tr2=1.34&diff_format=h">M</a></td><td width='1%'>1.34</td><td width='100%'>doc/configure.ac</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/ada-tests/ChangeLog:1.85 rtems/c/src/ada-tests/ChangeLog:1.86
--- rtems/c/src/ada-tests/ChangeLog:1.85 Wed Feb 2 08:57:40 2011
+++ rtems/c/src/ada-tests/ChangeLog Fri Mar 4 10:18:35 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * configure.ac: Rename RTEMS_API into _RTEMS_API.
+
</font> 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
<font color='#006600'>diff -u rtems/c/src/ada-tests/configure.ac:1.26 rtems/c/src/ada-tests/configure.ac:1.27
--- rtems/c/src/ada-tests/configure.ac:1.26 Wed Feb 2 08:57:40 2011
+++ rtems/c/src/ada-tests/configure.ac Fri Mar 4 10:18:41 2011
</font><font color='#997700'>@@ -36,7 +36,7 @@
</font>
RTEMS_PROJECT_ROOT
<font color='#880000'>-AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][RTEMS_API][/ada-tests"])
</font><font color='#000088'>+AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/ada-tests"])
</font>
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
<font color='#006600'>diff -u rtems/doc/ChangeLog:1.299 rtems/doc/ChangeLog:1.300
--- rtems/doc/ChangeLog:1.299 Fri Mar 4 09:34:10 2011
+++ rtems/doc/ChangeLog Fri Mar 4 10:20:41 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * configure.ac: Rename RTEMS_API into _RTEMS_API.
+
</font> 2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1744/doc
<font color='#006600'>diff -u rtems/doc/configure.ac:1.33 rtems/doc/configure.ac:1.34
--- rtems/doc/configure.ac:1.33 Wed Feb 2 09:01:16 2011
+++ rtems/doc/configure.ac Fri Mar 4 10:20:41 2011
</font><font color='#997700'>@@ -143,7 +143,7 @@
</font> test -d common || mkdir common
cat << EOF > common/rtems.sed~
:t
<font color='#880000'>-s/@RTEMSAPI@/RTEMS_API/;t t
</font><font color='#000088'>+s/@RTEMSAPI@/_RTEMS_API/;t t
</font> s,@RTEMSPREFIX@,$prefix,;t t
s,@RTEMSRPMPREFIX@,$rpmprefix,;t t
EOF
</pre>
<p> </p>
<a name='cs5'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/ChangeLog.diff?r1=text&tr1=1.391&r2=text&tr2=1.392&diff_format=h">M</a></td><td width='1%'>1.392</td><td width='100%'>ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/Makefile.maint.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>Makefile.maint</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/aclocal/rpm.m4.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>aclocal/rpm.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/aclocal/rtems-top.m4.diff?r1=text&tr1=1.24&r2=text&tr2=1.25&diff_format=h">M</a></td><td width='1%'>1.25</td><td width='100%'>aclocal/rtems-top.m4</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/aclocal/version.m4.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>aclocal/version.m4</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/ChangeLog:1.391 rtems/ChangeLog:1.392
--- rtems/ChangeLog:1.391 Thu Mar 3 10:07:17 2011
+++ rtems/ChangeLog Fri Mar 4 10:22:17 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+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.
+
</font> 2011-03-03 Ralf Corsépius <ralf.corsepius@rtems.org>
* bootstrap: Add -g option.
<font color='#006600'>diff -u rtems/Makefile.maint:1.29 rtems/Makefile.maint:1.30
--- rtems/Makefile.maint:1.29 Mon Jun 21 17:55:56 2010
+++ rtems/Makefile.maint Fri Mar 4 10:22:17 2011
</font><font color='#997700'>@@ -145,7 +145,7 @@
</font> api="$$v.$$(($$r + 1))"; \
echo "New branch release: $$version"; \
sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
<font color='#880000'>- -e "s|\[RTEMS_API\],\[.*\]|\[RTEMS_API\],\[$$api\]|" \
</font><font color='#000088'>+ -e "s|\[_RTEMS_API\],\[.*\]|\[_RTEMS_API\],\[$$api\]|" \
</font> $(VERSION_FILES); \
sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
<font color='#006600'>diff -u rtems/aclocal/rpm.m4:1.2 rtems/aclocal/rpm.m4:1.3
--- rtems/aclocal/rpm.m4:1.2 Mon Feb 2 22:56:26 2004
+++ rtems/aclocal/rpm.m4 Fri Mar 4 10:22:17 2011
</font><font color='#997700'>@@ -2,19 +2,19 @@
</font> AC_ARG_ENABLE([rpmprefix],
[ --enable-rpmprefix=<rpmprefix> prefix rpms],
[case $enable_rpmprefix in
<font color='#880000'>-yes ) rpmprefix="rtems-"]RTEMS_API["-";;
</font><font color='#000088'>+yes ) rpmprefix="rtems-"]_RTEMS_API["-";;
</font> no ) rpmprefix="%{nil}";;
* ) AS_IF([test -z "$enable_rpmprefix"],
[rpmprefix="%{nil}"],
[rpmprefix="$enable_rpmprefix"]);;
esac],
<font color='#880000'>-[rpmprefix="rtems-"]RTEMS_API["-"])
</font><font color='#000088'>+[rpmprefix="rtems-"]_RTEMS_API["-"])
</font>
AC_ARG_ENABLE([osversions],
[ --enable-osversions whether to use version numbers in os-tripples],
[case $enable_osversions in
<font color='#880000'>-yes ) osversion=RTEMS_API;;
</font><font color='#000088'>+yes ) osversion=_RTEMS_API;;
</font> * ) osversion=;;
esac],
<font color='#880000'>-[osversion=RTEMS_API])
</font><font color='#000088'>+[osversion=_RTEMS_API])
</font> ])
<font color='#006600'>diff -u rtems/aclocal/rtems-top.m4:1.24 rtems/aclocal/rtems-top.m4:1.25
--- rtems/aclocal/rtems-top.m4:1.24 Sun Jul 27 01:47:01 2008
+++ rtems/aclocal/rtems-top.m4 Fri Mar 4 10:22:17 2011
</font><font color='#997700'>@@ -16,7 +16,7 @@
</font> AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
<font color='#880000'>-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
</font><font color='#000088'>+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
</font>
RTEMS_TOPdir="$1";
AC_SUBST(RTEMS_TOPdir)
<font color='#006600'>diff -u rtems/aclocal/version.m4:1.29 rtems/aclocal/version.m4:1.30
--- rtems/aclocal/version.m4:1.29 Mon Jun 7 14:33:53 2010
+++ rtems/aclocal/version.m4 Fri Mar 4 10:22:17 2011
</font><font color='#997700'>@@ -1,4 +1,4 @@
</font> AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
<font color='#880000'>-m4_define([RTEMS_API],[4.11])
</font><font color='#000088'>+m4_define([_RTEMS_API],[4.11])
</font></pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>