From ccf351b1e299b1d6387f825bbab06d8d3cc7c80a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 6 Sep 2014 13:01:44 -0600
Subject: Fix all install targets

---
 apps/system/cdcacm/Makefile         | 8 ++++----
 apps/system/composite/Makefile      | 8 ++++----
 apps/system/flash_eraseall/Makefile | 8 ++++----
 apps/system/free/Makefile           | 8 ++++----
 apps/system/hex2bin/Makefile        | 8 ++++----
 apps/system/i2c/Makefile            | 8 ++++----
 apps/system/install/Makefile        | 8 ++++----
 apps/system/mdio/Makefile           | 8 ++++----
 apps/system/nxplayer/Makefile       | 8 ++++----
 apps/system/poweroff/Makefile       | 8 ++++----
 apps/system/prun/Makefile           | 8 ++++----
 apps/system/ramtest/Makefile        | 8 ++++----
 apps/system/ramtron/Makefile        | 8 ++++----
 apps/system/sdcard/Makefile         | 8 ++++----
 apps/system/sudoku/Makefile         | 8 ++++----
 apps/system/sysinfo/Makefile        | 8 ++++----
 apps/system/usbmsc/Makefile         | 8 ++++----
 apps/system/vi/Makefile             | 8 ++++----
 apps/system/zmodem/Makefile         | 8 ++++----
 19 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'apps/system')

diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile
index e00a02d36..74e81c7b2 100644
--- a/apps/system/cdcacm/Makefile
+++ b/apps/system/cdcacm/Makefile
@@ -88,11 +88,11 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/composite/Makefile b/apps/system/composite/Makefile
index b7976839d..8a13a623e 100644
--- a/apps/system/composite/Makefile
+++ b/apps/system/composite/Makefile
@@ -88,11 +88,11 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile
index f334c685c..d03a7561b 100644
--- a/apps/system/flash_eraseall/Makefile
+++ b/apps/system/flash_eraseall/Makefile
@@ -92,11 +92,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 62de5601d..d7a42c050 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -88,11 +88,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/hex2bin/Makefile b/apps/system/hex2bin/Makefile
index 13bac85ea..48a984033 100644
--- a/apps/system/hex2bin/Makefile
+++ b/apps/system/hex2bin/Makefile
@@ -117,11 +117,11 @@ rhex2mem:
 endif
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index d6e355c88..de3dc21d4 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -81,11 +81,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index aa3477c06..a617fb4fc 100644
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -92,11 +92,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/mdio/Makefile b/apps/system/mdio/Makefile
index fb25cf7ae..fa7f6bd10 100644
--- a/apps/system/mdio/Makefile
+++ b/apps/system/mdio/Makefile
@@ -84,11 +84,11 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile
index 5597e6af0..3f0c9d949 100644
--- a/apps/system/nxplayer/Makefile
+++ b/apps/system/nxplayer/Makefile
@@ -94,11 +94,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile
index 50340c723..a2d0f9d85 100644
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -92,11 +92,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/prun/Makefile b/apps/system/prun/Makefile
index 8b0cfafc8..0801f0298 100644
--- a/apps/system/prun/Makefile
+++ b/apps/system/prun/Makefile
@@ -98,11 +98,11 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile
index 01146b997..1b426207a 100644
--- a/apps/system/ramtest/Makefile
+++ b/apps/system/ramtest/Makefile
@@ -85,11 +85,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile
index 45db17f56..4f5327abc 100644
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -92,11 +92,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile
index 4a9642147..e66855a3c 100644
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -92,11 +92,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/sudoku/Makefile b/apps/system/sudoku/Makefile
index 8b24f3c79..40370372e 100644
--- a/apps/system/sudoku/Makefile
+++ b/apps/system/sudoku/Makefile
@@ -88,11 +88,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile
index f57bba577..7956fac88 100644
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -93,11 +93,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/usbmsc/Makefile b/apps/system/usbmsc/Makefile
index c7433fcb5..de0d25a6a 100644
--- a/apps/system/usbmsc/Makefile
+++ b/apps/system/usbmsc/Makefile
@@ -91,11 +91,11 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile
index 0d810651f..d3e8d8f34 100644
--- a/apps/system/vi/Makefile
+++ b/apps/system/vi/Makefile
@@ -89,11 +89,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
diff --git a/apps/system/zmodem/Makefile b/apps/system/zmodem/Makefile
index 1e588bb38..e8d813634 100644
--- a/apps/system/zmodem/Makefile
+++ b/apps/system/zmodem/Makefile
@@ -88,11 +88,11 @@ $(COBJS): %$(OBJEXT): %.c
 	$(Q) touch .built
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(INSTALL_DIR)/$(PROGNAME): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
 
-install: $(INSTALL_DIR)/$(PROGNAME)
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
 
 else
 install:
-- 
cgit v1.2.3