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.
This commit is contained in:
Ralf Corsepius
2011-03-04 16:22:17 +00:00
parent 2989ee960d
commit b42cae739f
5 changed files with 12 additions and 7 deletions
+5
View File
@@ -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.
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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])
])
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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])