diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-02 15:26:41 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-02 15:26:41 +0000 |
commit | 399432faac047151bd9f57a38f6418579405aaf5 (patch) | |
tree | bfaaa1ef6269f5b7a27ded69690a5ee22a11459f | |
parent | Patches rtems-rc-20000118-5.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-399432faac047151bd9f57a38f6418579405aaf5.tar.bz2 |
Patch rtems-rc-20000118-6.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains:
The workarounds related to the issues with
ppc/helas403 (triggers a nasty bug in automake-2.14) and mcp750.cfg
(Which is basically broken)
To apply:
patch -p1 < rtems-rc-20000118-6.diff
./bootstrap
Note:
* Though this patch is small, ./bootstrap is absolutely necessary.
* Now your CVS source tree is identical to my local CVS.
-rw-r--r-- | c/src/lib/libbsp/bsp.am | 7 | ||||
-rw-r--r-- | make/custom/mcp750.cfg | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/bsp.am b/c/src/lib/libbsp/bsp.am index 1b595c6032..73406314c6 100644 --- a/c/src/lib/libbsp/bsp.am +++ b/c/src/lib/libbsp/bsp.am @@ -2,13 +2,12 @@ ## $Id$ ## -PREINSTALL_FILES += \ -$(PROJECT_ROOT)/@RTEMS_BSP@/lib \ -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs - $(PROJECT_ROOT)/@RTEMS_BSP@/lib: @$(mkinstalldirs) $@ $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs $(INSTALL_DATA) $< $@ +## FIXME: Do not split this line into several lines +## A bug in automake-2.14 will generate incorrect results otherwise +PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg index f3e713d55e..e2446cd902 100644 --- a/make/custom/mcp750.cfg +++ b/make/custom/mcp750.cfg @@ -104,8 +104,8 @@ define make-exe echo $${COMPLETE_FILE_NAME} ;\ FILE_NAME=`basename $${COMPLETE_FILE_NAME}` ;\ echo $${FILE_NAME} ;\ - mkdir -p $(PROJECT_ROOT)/$(RTEMS_BSP)/bin ;\ - $(CP) bootloader $(PROJECT_ROOT)/$(RTEMS_BSP)/bin/$${FILE_NAME} + mkdir -p $(PROJECT_ROOT)/mcp750/bin ;\ + $(CP) bootloader $(PROJECT_ROOT)/mcp750/bin/$${FILE_NAME} endef # Miscellaneous additions go here |