From 5f8867fb985b2b899e2ba8391652c7111f9df9bb Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 30 May 2012 18:45:34 +0200
Subject: Update to work with whitespace in exec path

OTP-10106
OTP-10107
---
 erts/etc/win32/Makefile      | 16 ++++++++--------
 erts/etc/win32/nsis/Makefile | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'erts/etc/win32')

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;\
-- 
cgit v1.2.3