diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 09:30:22 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 09:30:22 +0000 |
commit | 703e81b58b82097a9634466b1c7dde63de0a4230 (patch) | |
tree | 21a3e2608e9fed7ab47a8c7c94e9d3b6d31e6611 | |
parent | 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-703e81b58b82097a9634466b1c7dde63de0a4230.tar.bz2 |
Assume PROJECT_ROOT to contain RTEMS_BSP.
-rw-r--r-- | testsuites/aclocal/env-rtemsbsp.m4 | 6 | ||||
-rw-r--r-- | testsuites/automake/compile.am | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuites/aclocal/env-rtemsbsp.m4 b/testsuites/aclocal/env-rtemsbsp.m4 index cd87b309d6..0f721845ca 100644 --- a/testsuites/aclocal/env-rtemsbsp.m4 +++ b/testsuites/aclocal/env-rtemsbsp.m4 @@ -31,9 +31,9 @@ AC_SUBST(BARE_CPU_CFLAGS) includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" libdir="\${exec_prefix}/${RTEMS_BSP}/lib" -AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"]) -AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib"]) -AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"]) +AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"]) +AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib"]) +AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"]) AC_SUBST([project_libdir],["\$(libdir)"]) AC_SUBST([project_includedir],["\$(includedir)"]) diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index 4f224bd1ce..16a7e7bba8 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -25,10 +25,10 @@ ${ARCH}/$(dirstamp): LINK_OBJS = \ $(OBJS) \ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_ROOT)/@RTEMS_BSP@/lib/no-%.rel) + $(MANAGERS_NOT_WANTED:%=$(PROJECT_ROOT)/lib/no-%.rel) LINK_FILES =\ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_ROOT)/@RTEMS_BSP@/lib/no-%.rel) + $(MANAGERS_NOT_WANTED:%=$(PROJECT_ROOT)/lib/no-%.rel) ## ------------------------------------------------------------------------- ARCH = o-optimize |