diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-17 08:17:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-17 08:17:55 +0000 |
| commit | 62f082938c9c9bf6e5337e0c8329b17de6d29004 (patch) | |
| tree | 0e48ebf9dbed7d646f3dde78136ec9213ec46c83 /cpukit/aclocal | |
| parent | 2003-10-13 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-62f082938c9c9bf6e5337e0c8329b17de6d29004.tar.bz2 | |
2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Check for sys/cdefs.h.
* aclocal/env-rtems-cpu.m4: Add project_includedir.
Deprecate PROJECT_INCLUDE. Change project_includedir to
$(PROJECT_ROOT)/include for multilibs.
Diffstat (limited to 'cpukit/aclocal')
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 71f57b7ac2..9e888cdacf 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -14,10 +14,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, [MULTISUBDIR="/$with_multisubdir"]) AC_SUBST(MULTISUBDIR) - PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" + project_includedir="\$(PROJECT_ROOT)/include" project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)" - includedir="\${exec_prefix}/lib/include" + includedir="\${exec_prefix}/include" libdir="${libdir}\$(MULTISUBDIR)" ], [ @@ -39,7 +39,7 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, AC_MSG_RESULT(${RTEMS_BSP}) AC_SUBST(RTEMS_BSP) - PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" + project_includedir="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" @@ -51,7 +51,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, ]) AC_SUBST(project_libdir) - AC_SUBST(PROJECT_INCLUDE) + AC_SUBST(project_includedir) + + # FIXME: Deprecated, to be removed + AC_SUBST(PROJECT_INCLUDE,[$project_includedir]) AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"]) ]) |