Merge branch 'maint'

* maint:
  Update to work with space in include path
  Update to work with whitespace in exec path

7 files changed, 56 insertions, 56 deletions

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index 28c5e5ccad..b10f5d9a87 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -545,48 +545,48 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 .PHONY: release_spec
 release_spec: etc
 ifneq ($(INSTALL_OBJS),)
-	$(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/obj
-	$(INSTALL_DATA) $(INSTALL_OBJS) $(RELEASE_PATH)/erts-$(VSN)/obj
+	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/obj"
+	$(INSTALL_DATA) $(INSTALL_OBJS) "$(RELEASE_PATH)/erts-$(VSN)/obj"
 endif
-	$(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/bin
+	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 ifneq ($(TARGET), win32)
 ifneq ($(findstring vxworks,$(TARGET)), vxworks)
 ifneq ($(findstring ose,$(TARGET)), ose)
-	$(INSTALL_SCRIPT) erl.src $(RELEASE_PATH)/erts-$(VSN)/bin
+	$(INSTALL_SCRIPT) erl.src "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
 endif
 endif
 ifneq ($(INSTALL_PROGS),)
-	$(INSTALL_PROGRAM) $(INSTALL_PROGS) $(RELEASE_PATH)/erts-$(VSN)/bin
+	$(INSTALL_PROGRAM) $(INSTALL_PROGS) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
 ifneq ($(INSTALL_TOP),)
-	$(INSTALL_SCRIPT) $(INSTALL_TOP) $(RELEASE_PATH)
+	$(INSTALL_SCRIPT) $(INSTALL_TOP) "$(RELEASE_PATH)"
 endif
 ifneq ($(INSTALL_TOP_BIN),)
-	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH)
+	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
 endif
 ifneq ($(INSTALL_MISC),)
-	$(INSTALL_DIR) $(RELEASE_PATH)/misc
-	$(INSTALL_SCRIPT) $(INSTALL_MISC) $(RELEASE_PATH)/misc
+	$(INSTALL_DIR) "$(RELEASE_PATH)/misc"
+	$(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
 endif
 ifneq ($(INSTALL_ERL_OSE),)
-	$(INSTALL_DIR) $(RELEASE_PATH)/build_erl_ose
+	$(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose"
 	cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
-	cd $(OSEETC) && $(INSTALL_SCRIPT) erl_ose_$(SYSTEM_VSN).tar $(RELEASE_PATH)/build_erl_ose
+	cd $(OSEETC) && $(INSTALL_SCRIPT) erl_ose_$(SYSTEM_VSN).tar "$(RELEASE_PATH)/build_erl_ose"
 endif
 ifneq ($(INSTALL_SRC),)
-	$(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/src
-	$(INSTALL_DATA) $(INSTALL_SRC) $(RELEASE_PATH)/erts-$(VSN)/src
+	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
+	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
 endif
 ifneq ($(INSTALL_EMBEDDED_DATA),)
-	$(INSTALL_DATA) $(INSTALL_EMBEDDED_DATA) $(RELEASE_PATH)/erts-$(VSN)/bin
+	$(INSTALL_DATA) $(INSTALL_EMBEDDED_DATA) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
 ifneq ($(INSTALL_LIBS),)
-	$(INSTALL_DATA) $(INSTALL_LIBS) $(RELEASE_PATH)/erts-$(VSN)/bin
+	$(INSTALL_DATA) $(INSTALL_LIBS) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
 ifneq ($(INSTALL_INCLUDES),)
-	$(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/include
-	$(INSTALL_DATA) $(INSTALL_INCLUDES) $(RELEASE_PATH)/erts-$(VSN)/include
+	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/include"
+	$(INSTALL_DATA) $(INSTALL_INCLUDES) "$(RELEASE_PATH)/erts-$(VSN)/include"
 endif
 
 .PHONY: release_docs_spec
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 4692354ffc..790b0ed400 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1145,7 +1145,7 @@ start_epmd(char *epmd)
 	erts_snprintf(epmd_cmd, sizeof(epmd_cmd), "%s" DIRSEP "epmd", bindir);
 	arg1 = "-daemon";
 #else
-	erts_snprintf(epmd_cmd, sizeof(epmd_cmd), "%s" DIRSEP "epmd -daemon", bindir);
+	erts_snprintf(epmd_cmd, sizeof(epmd_cmd), "\"%s" DIRSEP "epmd\" -daemon", bindir);
 #endif
     } 
 #ifdef __WIN32__
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 8f40c43874..58f7b38ed0 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -66,12 +66,12 @@ then
     exit 1
 fi
 
-if [ ! -d $ERL_ROOT/bin ]
+if [ ! -d "$ERL_ROOT/bin" ]
 then
-    mkdir $ERL_ROOT/bin
+    mkdir "$ERL_ROOT/bin"
 fi
 
-cd $ERL_ROOT/erts-%I_VSN%/bin
+cd "$ERL_ROOT/erts-%I_VSN%/bin"
 
 sed -e "s;%FINAL_ROOTDIR%;$TARGET_ERL_ROOT;" erl.src > erl
 chmod 755 erl
@@ -79,18 +79,18 @@ chmod 755 erl
 #
 # Create start file for embedded system use,
 #
-(cd $ERL_ROOT/erts-%I_VSN%/bin;
+(cd "$ERL_ROOT/erts-%I_VSN%/bin";
   sed -e "s;%FINAL_ROOTDIR%;$TARGET_ERL_ROOT;" start.src > start;
   chmod 755 start)
 
-cd $ERL_ROOT/bin
+cd "$ERL_ROOT/bin"
 
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/erl .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/erlc .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/dialyzer .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/typer .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/ct_run .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/escript .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erl" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erlc" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/dialyzer" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" .
 
 # Remove in R16B
 ln -s ct_run run_test
@@ -107,15 +107,15 @@ fi
 
 ln -s ../erts-%I_VSN%/bin/epmd epmd
 
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
-cp -p $ERL_ROOT/erts-%I_VSN%/bin/start .
-sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/run_erl" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/to_erl" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/start" .
+sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" "$ERL_ROOT/erts-%I_VSN%/bin/start_erl.src" > start_erl
 chmod 755 start_erl
 echo ""
 
-echo %I_VSN% %I_SYSTEM_VSN% > $ERL_ROOT/releases/start_erl.data
-sed -e "s;%ERL_ROOT%;$TARGET_ERL_ROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES
+echo %I_VSN% %I_SYSTEM_VSN% > "$ERL_ROOT/releases/start_erl.data"
+sed -e "s;%ERL_ROOT%;$TARGET_ERL_ROOT;" "$ERL_ROOT/releases/RELEASES.src" > "$ERL_ROOT/releases/RELEASES"
 
 if [ "$start_option" = "query" ]
 then
@@ -147,10 +147,10 @@ cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
 # Fixing the man pages
 #
 
-if [ -d $ERL_ROOT/man ]
+if [ -d "$ERL_ROOT/man" ]
 then
-    cd $ERL_ROOT
-    ./misc/format_man_pages $ERL_ROOT
+    cd "$ERL_ROOT"
+    ./misc/format_man_pages "$ERL_ROOT"
 fi
 
 exit 0
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 0b2d6512ea..6a431ce4da 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -227,7 +227,7 @@ done
 PATH=$BINDIR:$ROOTDIR/bin:$PATH
 EXEC=$BINDIR/erlexec
 
-PROGNAME="$PROGNAME $cargs"
+PROGNAME="$PROGNAME$cargs"
 EMU="$EMU$TYPE"
 EMU_NAME=`$EXEC -emu_name_exit $eeargs`
 
diff --git a/erts/etc/unix/erl.src.src b/erts/etc/unix/erl.src.src
index 50603f12f4..fa187c5509 100644
--- a/erts/etc/unix/erl.src.src
+++ b/erts/etc/unix/erl.src.src
@@ -17,7 +17,7 @@
 # 
 # %CopyrightEnd%
 #
-ROOTDIR=%FINAL_ROOTDIR%
+ROOTDIR="%FINAL_ROOTDIR%"
 BINDIR=$ROOTDIR/erts-%VSN%/bin
 EMU=%EMULATOR%%EMULATOR_NUMBER%
 PROGNAME=`echo $0 | sed 's/.*\///'`
@@ -25,4 +25,4 @@ export EMU
 export ROOTDIR
 export BINDIR
 export PROGNAME
-exec $BINDIR/erlexec ${1+"$@"}
+exec "$BINDIR/erlexec" ${1+"$@"}
diff --git a/erts/etc/win32/Makefile b/erts/etc/win32/Makefile
index 400e5c5bba..4218be1eff 100644
--- a/erts/etc/win32/Makefile
+++ b/erts/etc/win32/Makefile
@@ -59,14 +59,14 @@ opt debug all clean depend:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/bin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(ROOTSYSDIR)/usr/include
-	$(INSTALL_DIR) $(ROOTSYSDIR)/usr/lib
-	$(INSTALL_DIR) $(ROOTSYSDIR)/usr/lib/icons
-	$(INSTALL_PROGRAM) $(INSTALL_PROGS) $(RELSYSDIR)/bin
-	$(INSTALL_DATA) $(INSTALL_SRC) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INSTALL_ICONS) $(ROOTSYSDIR)/usr/lib/icons
+	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(ROOTSYSDIR)/usr/include"
+	$(INSTALL_DIR) "$(ROOTSYSDIR)/usr/lib"
+	$(INSTALL_DIR) "$(ROOTSYSDIR)/usr/lib/icons"
+	$(INSTALL_PROGRAM) $(INSTALL_PROGS) "$(RELSYSDIR)/bin"
+	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INSTALL_ICONS) "$(ROOTSYSDIR)/usr/lib/icons"
 
 release_docs release_docs_spec docs:
 
diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index 6a93c5153d..4ed4ef2700 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -44,14 +44,14 @@ TARGET_DIR = $(RELEASE_PATH)
 ifeq ($(MSYSTEM),MINGW32)
 
   MAKENSISFLAGS = //V2
-  WTESTROOT=$(shell (msys2win_path.sh $(RELEASE_PATH)))
-  WTARGET_DIR=$(shell (msys2win_path.sh $(TARGET_DIR)))
+  WTESTROOT=$(shell (msys2win_path.sh "$(RELEASE_PATH)"))
+  WTARGET_DIR=$(shell (msys2win_path.sh "$(TARGET_DIR)"))
 
 else
 
   MAKENSISFLAGS = /V2
-  WTESTROOT=$(shell (cygpath -d $(RELEASE_PATH) 2>/dev/null || cygpath -w $(RELEASE_PATH)))
-  WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET_DIR)))
+  WTESTROOT=$(shell (cygpath -d "$(RELEASE_PATH)" 2>/dev/null || cygpath -w "$(RELEASE_PATH)"))
+  WTARGET_DIR=$(shell (cygpath -d "$(TARGET_DIR)" 2>/dev/null || cygpath -d "$(TARGET_DIR)"))
 
 endif
 
@@ -74,7 +74,7 @@ release_spec:
 	  echo '!define ERTS_VERSION "$(VSN)"' >> $(VERSION_HEADER);\
 	  echo '!define TESTROOT "$(WTESTROOT)"' >> $(VERSION_HEADER);\
 	  echo '!define OUTFILEDIR "$(WTARGET_DIR)"' >> $(VERSION_HEADER);\
-	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
+	  if [ -f "$(RELEASE_PATH)/docs/doc/index.html" ];\
 	  then\
 		echo '!define HAVE_DOCS 1' >> $(VERSION_HEADER); \
 	  fi;\
@@ -91,13 +91,13 @@ release_spec:
 	  fi;\
 	  if [ '!' -z "$(REDIST_FILE)" -a '!' -z "$(REDIST_DLL_VERSION)" ];\
 	  then \
-		cp $(REDIST_FILE) $(RELEASE_PATH)/$(REDIST_TARGET);\
+		cp $(REDIST_FILE) "$(RELEASE_PATH)/$(REDIST_TARGET);"\
 		echo '!define HAVE_REDIST_FILE 1'  >> $(VERSION_HEADER); \
 		echo '!define REDIST_DLL_VERSION "$(REDIST_DLL_VERSION)"' >> $(VERSION_HEADER);\
 		echo '!define REDIST_DLL_NAME "$(REDIST_DLL_NAME)"' >> $(VERSION_HEADER);\
 		echo '!define REDIST_EXECUTABLE "$(REDIST_TARGET)"' >> $(VERSION_HEADER);\
 	  fi;\
-	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
+	  if [ -f "$(RELEASE_PATH)/docs/doc/index.html" ];\
 	  then \
 		echo '!define HAVE_DOCS 1' >> $(VERSION_HEADER); \
 	  fi;\