Several fixes for errors introduced by last check-ins

5 files changed, 37 insertions, 17 deletions

diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile
index 14b83ffa6..5d1d89e1f 100644
--- a/apps/examples/adc/Makefile
+++ b/apps/examples/adc/Makefile
@@ -94,7 +94,7 @@ else
 install:
 
 endif
-`
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
diff --git a/apps/examples/hello/Kconfig b/apps/examples/hello/Kconfig
index d697daa8a..13c68e874 100644
--- a/apps/examples/hello/Kconfig
+++ b/apps/examples/hello/Kconfig
@@ -10,4 +10,13 @@ config EXAMPLES_HELLO
 		Enable the \"Hello, World!\" example
 
 if EXAMPLES_HELLO
+
+config EXAMPLES_HELLO_PROGNAME
+	string "Program name"
+	default "hello"
+	depends on BUILD_KERNEL
+	---help---
+		This is the name of the program that will be use when the NSH ELF
+		program is installed.
+
 endif
diff --git a/apps/examples/nrf24l01_term/Makefile b/apps/examples/nrf24l01_term/Makefile
index 3f7f0f2ea..a9c1f4dab 100644
--- a/apps/examples/nrf24l01_term/Makefile
+++ b/apps/examples/nrf24l01_term/Makefile
@@ -83,10 +83,6 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
-#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
-	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
-
 ifeq ($(CONFIG_BUILD_KERNEL),y)
 $(INSTALL_DIR)/$(PROGNAME): $(OBJS)
 	@echo "LD: $<"
@@ -99,8 +95,12 @@ install:
 
 endif
 
+#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
 context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
-else
+#else
 #context:
 #endif
 
diff --git a/apps/examples/nsh/Kconfig b/apps/examples/nsh/Kconfig
index bbb5ece01..a1848826b 100644
--- a/apps/examples/nsh/Kconfig
+++ b/apps/examples/nsh/Kconfig
@@ -13,6 +13,14 @@ config EXAMPLES_NSH
 
 if EXAMPLES_NSH
 
+config EXAMPLES_NSH_PROGNAME
+	string "Program name"
+	default "nsh"
+	depends on BUILD_KERNEL
+	---help---
+		This is the name of the program that will be use when the NSH ELF
+		program is installed.
+
 config EXAMPLES_NSH_CXXINITIALIZE
 	bool "C++ Initialization"
 	default n
diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile
index f38d477fc..f16a40549 100644
--- a/apps/examples/nsh/Makefile
+++ b/apps/examples/nsh/Makefile
@@ -39,30 +39,33 @@ include $(APPDIR)/Make.defs
 
 # NuttShell (NSH) Example
 
-ASRCS		=
-CSRCS		= nsh_main.c
+ASRCS =
+CSRCS = nsh_main.c
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN		= ..\..\libapps$(LIBEXT)
+  BIN = ..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN		= ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\libapps$(LIBEXT)
 else
-  BIN		= ../../libapps$(LIBEXT)
+  BIN = ../../libapps$(LIBEXT)
 endif
 endif
 
-ROOTDEPPATH	= --dep-path .
+CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT)
+PROGNAME = $(CONFIG_NSH_PROGNAME)
+
+ROOTDEPPATH = --dep-path .
 
 # Common build
 
-VPATH		=
+VPATH =
 
 all: .built
 .PHONY: clean depend distclean