diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-08 23:56:52 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-08 23:56:52 +0000 |
| commit | 671ce2e8af66b9df29049de3e42b3496cf7d5e86 (patch) | |
| tree | 6308345c7b79e383a374d43f2483dd62082cf48c /c/src/make | |
| parent | 2011-03-08 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-671ce2e8af66b9df29049de3e42b3496cf7d5e86.tar.bz2 | |
2011-03-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.inc.in: Fix PROJECT_ROOT to match usage in templates and
existing Makefiles.
Diffstat (limited to 'c/src/make')
| -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 |