diff options
| -rw-r--r-- | c/src/make/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/make/Makefile.inc.in | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 3d5bf9fbeb..e543a18714 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,8 @@ +2011-03-08 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.inc.in: Fix PROJECT_ROOT to match usage in templates and + existing Makefiles. + 2011-03-07 Ralf Corsépius <ralf.corsepius@rtems.org> * Makefile.am, configure.ac: Move file generation into Makefile. diff --git a/c/src/make/Makefile.inc.in b/c/src/make/Makefile.inc.in index 322e790c4a..35c997b65f 100644 --- a/c/src/make/Makefile.inc.in +++ b/c/src/make/Makefile.inc.in @@ -34,8 +34,10 @@ export AR export SIZE export OBJCOPY -RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg -PROJECT_ROOT = @pkgdatadir@ +RTEMS_ROOT = $(prefix) +PROJECT_ROOT = $(RTEMS_ROOT) +RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg + RTEMS_USE_OWN_PDIR = no RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ RTEMS_HAS_ITRON_API = no @@ -45,6 +47,3 @@ export RTEMS_BSP export RTEMS_CUSTOM export PROJECT_ROOT -# FIXME: The following shouldn't be here -RTEMS_ROOT = $(PROJECT_ROOT) -export RTEMS_ROOT |