From 5a44013837d69af11d6131728d23f5c7f4472ff9 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 16 Nov 2012 12:41:58 +0000
Subject: [PATCH] Changes from Mike

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
---
 ChangeLog.txt                       |  3 +++
 Makefile                            | 11 +++--------
 examples/elf/tests/errno/Makefile   |  3 ++-
 examples/elf/tests/hello/Makefile   |  3 ++-
 examples/elf/tests/helloxx/Makefile |  9 +++++----
 examples/elf/tests/longjmp/Makefile |  3 ++-
 examples/elf/tests/mutex/Makefile   |  3 ++-
 examples/elf/tests/pthread/Makefile |  3 ++-
 examples/elf/tests/signal/Makefile  |  3 ++-
 examples/elf/tests/struct/Makefile  |  3 ++-
 examples/elf/tests/task/Makefile    |  3 ++-
 11 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1a88900be..c1c5189c4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -419,3 +419,6 @@
 	  by Freddie Chopin.
 	* Makefile, */Makefile:  Various fixes for Windows native build.  Now uses
 	  make foreach loops instead of shell loops.
+	* apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use
+	  mkdir -p then install without the -D.  From Mike Smith.
+
diff --git a/Makefile b/Makefile
index c172135ec..7e7d52a40 100644
--- a/Makefile
+++ b/Makefile
@@ -102,15 +102,9 @@ endif
 
 # Create the list of available applications (INSTALLED_APPS)
 
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 define ADD_BUILTIN
-  INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,)
+  INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,)
 endef
-else
-define ADD_BUILTIN
-  INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,)
-endef
-endif
 
 $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
 
@@ -119,7 +113,8 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
 # provided by the user (possibly as a symbolic link) to add libraries and
 # applications to the standard build from the repository.
 
-EXTERNAL_DIR := $(dir $(wildcard external/Makefile))
+EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile))
+
 INSTALLED_APPS += $(EXTERNAL_DIR)
 SUBDIRS += $(EXTERNAL_DIR)
 
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 92cff9e12..09d469f9b 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -55,5 +55,6 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index e1c396c3c..88770276b 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index d115fbeaf..45b4b8868 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -109,12 +109,13 @@ clean:
 	@rm -f $(ALL_BIN) *.o *~ .*.swp core
 
 install: $(ALL_BIN)
-	@install -D $(BIN1) $(ROMFS_DIR)/$(BIN1)
-	@install -D $(BIN2) $(ROMFS_DIR)/$(BIN2)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN1) $(ROMFS_DIR)/$(BIN1)
+	@install $(BIN2) $(ROMFS_DIR)/$(BIN2)
 ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
-	@install -D $(BIN3) $(ROMFS_DIR)/$(BIN3)
+	@install $(BIN3) $(ROMFS_DIR)/$(BIN3)
 endif
-#	@install -D $(BIN4) $(ROMFS_DIR)/$(BIN4)
+#	@install $(BIN4) $(ROMFS_DIR)/$(BIN4)
 
 
 
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index 0cafe05e3..04da6ee81 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index efce216d8..756ada2c0 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index 134fabe01..4bea4515b 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 08710aeaa..9eaaf8609 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 3aa0e4a57..2ddd80b89 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -56,4 +56,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index 63a2eb211..accac987f 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -55,4 +55,5 @@ clean:
 	@rm -f $(BIN) *.o *~ .*.swp core
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	@mkdir -p $(ROMFS_DIR)
+	@install $(BIN) $(ROMFS_DIR)/$(BIN)