diff options
| -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 |