From 01e427b17c161d8adaa38d6bdb91aecb434451f2 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 26 Apr 2013 16:14:32 -0700
Subject: Merge working changes into export-build branch.

---
 makefiles/nuttx.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'makefiles/nuttx.mk')

diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk
index c6e2c86d1..346735a02 100644
--- a/makefiles/nuttx.mk
+++ b/makefiles/nuttx.mk
@@ -63,7 +63,10 @@ LDSCRIPT		+= $(NUTTX_EXPORT_DIR)build/ld.script
 #
 # Add directories from the NuttX export to the relevant search paths
 #
-INCLUDE_DIRS		+= $(NUTTX_EXPORT_DIR)include
+INCLUDE_DIRS		+= $(NUTTX_EXPORT_DIR)include \
+			   $(NUTTX_EXPORT_DIR)arch/chip \
+			   $(NUTTX_EXPORT_DIR)arch/common
+
 LIB_DIRS		+= $(NUTTX_EXPORT_DIR)libs
 LIBS			+= -lapps -lnuttx
 LINK_DEPS		+= $(NUTTX_EXPORT_DIR)libs/libapps.a \
@@ -71,5 +74,5 @@ LINK_DEPS		+= $(NUTTX_EXPORT_DIR)libs/libapps.a \
 
 $(NUTTX_CONFIG_HEADER):	$(NUTTX_ARCHIVE)
 	@$(ECHO) %% Unpacking $(NUTTX_ARCHIVE)
-	$(Q) $(UNZIP) -q -o -d $(WORK_DIR) $(NUTTX_ARCHIVE)
+	$(Q) $(UNZIP_CMD) -q -o -d $(WORK_DIR) $(NUTTX_ARCHIVE)
 	$(Q) $(TOUCH) $@
-- 
cgit v1.2.3