diff options
| author | px4dev <px4@purgatory.org> | 2013-01-16 18:23:49 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-02-23 22:00:58 -0800 |
| commit | d2d9800c2e7021a09175e964a41f43b71e94d996 (patch) | |
| tree | 18b563cf8e8afcf22b087d559ae065680e4b1588 /makefiles/firmware.mk | |
| parent | 2ebcd0fdcc4b743c3a8a32bae0852e9536bf3a6b (diff) | |
| download | px4-firmware-d2d9800c2e7021a09175e964a41f43b71e94d996.tar.gz px4-firmware-d2d9800c2e7021a09175e964a41f43b71e94d996.tar.bz2 px4-firmware-d2d9800c2e7021a09175e964a41f43b71e94d996.zip | |
Recover commits lost in the previous merge. Syllableise PX4_BASE like its peers.
Diffstat (limited to 'makefiles/firmware.mk')
| -rw-r--r-- | makefiles/firmware.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 34741e79e..3f41ec652 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -9,7 +9,12 @@ # Work out where this file is, so we can find other makefiles in the # same directory. # +# If PX4_BASE wasn't set previously, set it here now. +# export PX4_MK_INCLUDE ?= $(dir $(lastword $(MAKEFILE_LIST))) +ifeq ($(PX4_BASE),) +export PX4_BASE := $(abspath $(PX4_MK_INCLUDE)/..) +endif # # Use the linker script from the NuttX export @@ -36,6 +41,7 @@ include $(PX4_MK_INCLUDE)/$(PLATFORM).mk # # What we're going to build # +PRODUCT_BUNDLE = $(WORK_DIR)/firmware.px4 PRODUCT_BIN = $(WORK_DIR)/firmware.bin PRODUCT_SYM = $(WORK_DIR)/firmware.sym PRODUCTS = $(PRODUCT_BIN) $(PRODUCT_SYM) |