summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-28 23:56:21 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-28 23:56:21 +0000
commit4c7ece5b4c3a4f2cf7cf9271b254403de1fbdeb4 (patch)
treedb280cac6ac1a54b9bc4d26eb473b7a8605586d4
parent2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-4c7ece5b4c3a4f2cf7cf9271b254403de1fbdeb4.tar.bz2
2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Add RTEMS_API. AC_DEFAULT_PREFIX([/opt/rtems-][RTEMS_API]).
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/rtems-top.m44
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/aclocal/rtems-top.m44
4 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 13b5c53573..912dbb0775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/rtems-top.m4: Add RTEMS_API.
+ AC_DEFAULT_PREFIX([/opt/rtems-][RTEMS_API]).
+
2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index bdb79ed5e6..28bbfd9379 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -1,5 +1,7 @@
dnl $Id$
+m4_define([RTEMS_API],[4.6])
+
dnl
dnl RTEMS_TOP($1)
dnl
@@ -12,7 +14,7 @@ AC_CONFIG_AUX_DIR([$1])
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems])
+AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
## HACK to allow gnu-make conditionals in automake-Makefiles.
ENDIF=endif
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ceb53a8502..35a58550a2 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/rtems-top.m4: Add RTEMS_API.
+ AC_DEFAULT_PREFIX([/opt/rtems-][RTEMS_API]).
+
2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index f8c3fc90ec..f7d07c41dd 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -1,5 +1,7 @@
dnl $Id$
+m4_define([RTEMS_API],[4.6])
+
dnl
dnl RTEMS_TOP($1)
dnl
@@ -12,7 +14,7 @@ AC_CONFIG_AUX_DIR([$1])
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems])
+AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
## HACK to allow gnu-make conditionals in automake-Makefiles.
ENDIF=endif