Several fixes for errors introduced by last check-ins

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)

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

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
 

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

examples/nsh/Makefile

@@ -58,6 +58,9 @@ else
 endif
 endif
 
+CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT)
+PROGNAME = $(CONFIG_NSH_PROGNAME)
+
 ROOTDEPPATH = --dep-path .
 
 # Common build