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
---
 lib/inets/doc/src/Makefile                  | 14 ++++-----
 lib/inets/examples/httpd_load_test/Makefile |  2 +-
 lib/inets/examples/server_root/Makefile     | 46 ++++++++++++++---------------
 lib/inets/priv/Makefile                     |  4 +--
 lib/inets/src/ftp/Makefile                  | 10 +++----
 lib/inets/src/http_client/Makefile          | 10 +++----
 lib/inets/src/http_lib/Makefile             | 10 +++----
 lib/inets/src/http_server/Makefile          | 10 +++----
 lib/inets/src/inets_app/Makefile            | 14 ++++-----
 lib/inets/src/tftp/Makefile                 | 10 +++----
 lib/inets/test/Makefile                     | 16 +++++-----
 11 files changed, 73 insertions(+), 73 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index b3a98fd6d5..1a8e1c7ca8 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -140,13 +140,13 @@ clean_man:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/inets/examples/httpd_load_test/Makefile b/lib/inets/examples/httpd_load_test/Makefile
index 1cc61ad8ae..de1b2a289f 100644
--- a/lib/inets/examples/httpd_load_test/Makefile
+++ b/lib/inets/examples/httpd_load_test/Makefile
@@ -34,7 +34,7 @@ VSN=$(INETS_VSN)
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR         = $(RELEASE_PATH)/lib/inets-$(VSN)
-EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
+EXAMPLE_RELSYSDIR = "$(RELSYSDIR)/examples"
 HDLT_RELSYSDIR    = $(EXAMPLE_RELSYSDIR)/httpd_load_test
 
 
diff --git a/lib/inets/examples/server_root/Makefile b/lib/inets/examples/server_root/Makefile
index d7a3231068..2230a7eafc 100644
--- a/lib/inets/examples/server_root/Makefile
+++ b/lib/inets/examples/server_root/Makefile
@@ -174,36 +174,36 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/auth"
+	$(INSTALL_DATA) $(AUTH_FILES) "$(RELSYSDIR)/examples/server_root/auth"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/cgi-bin"
+	$(INSTALL_SCRIPT) $(CGI_FILES) "$(RELSYSDIR)/examples/server_root/cgi-bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/conf"
+	$(INSTALL_DATA) $(CONF_FILES) "$(RELSYSDIR)/examples/server_root/conf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/open"
 	$(INSTALL_DATA) $(OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+		"$(RELSYSDIR)/examples/server_root/htdocs/open"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open"
 	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/misc"
 	$(INSTALL_DATA) $(MISC_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/misc
+		"$(RELSYSDIR)/examples/server_root/htdocs/misc"
 	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret"
 	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret"
 	$(INSTALL_DATA) $(SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/secret"
 	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs"
+	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/examples/server_root/htdocs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/icons"
+	$(INSTALL_DATA) $(ICON_FILES) "$(RELSYSDIR)/examples/server_root/icons"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/ssl"
+	$(INSTALL_DATA) $(SSL_FILES) "$(RELSYSDIR)/examples/server_root/ssl"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/logs"
 
 release_docs_spec:
 
diff --git a/lib/inets/priv/Makefile b/lib/inets/priv/Makefile
index 85da409e55..4dc521f618 100644
--- a/lib/inets/priv/Makefile
+++ b/lib/inets/priv/Makefile
@@ -57,8 +57,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_SCRIPT) $(EXECUTABLES) "$(RELSYSDIR)/priv/bin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
index 19b93870df..426286f254 100644
--- a/lib/inets/src/ftp/Makefile
+++ b/lib/inets/src/ftp/Makefile
@@ -88,11 +88,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/ftp
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index d490e59929..850c790bd1 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -89,11 +89,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_client
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
index aaf3cfb995..3ec6ce7436 100644
--- a/lib/inets/src/http_lib/Makefile
+++ b/lib/inets/src/http_lib/Makefile
@@ -87,11 +87,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_lib
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index 60bb0d2527..67555d5f1c 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -123,11 +123,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_server
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 6da6a1d79f..b8d923edd8 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -111,13 +111,13 @@ $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
index f728543adb..a9df8d0319 100644
--- a/lib/inets/src/tftp/Makefile
+++ b/lib/inets/src/tftp/Makefile
@@ -93,11 +93,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/tftp
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 87ca60e4b3..7befa82272 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -234,7 +234,7 @@ endif
 # Release directory specification
 # ----------------------------------------------------
 
-RELTESTSYSDIR        = $(RELEASE_PATH)/inets_test
+RELTESTSYSDIR        = "$(RELEASE_PATH)/inets_test"
 RELTESTSYSALLDATADIR = $(RELTESTSYSDIR)/all_SUITE_data
 RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
 
@@ -284,9 +284,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/test
-	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) $(RELSYSDIR)/test
-	$(INSTALL_DATA) $(INETS_FILES) $(RELSYSDIR)/test
+	$(INSTALL_DIR)  "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(INETS_FILES) "$(RELSYSDIR)/test"
 	@for d in $(DATADIRS); do \
             echo "installing data dir $$d"; \
             if test -f $$d/TAR.exclude; then \
@@ -299,9 +299,9 @@ release_spec: opt
                 find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
                 find $$d -name 'core'           >> $$d/TAR.exclude2; \
                 find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
-                tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+                tar cfX - $$d/TAR.exclude2 $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
             else \
-                tar cf - $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+                tar cf - $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
             fi; \
         done
 
@@ -330,8 +330,8 @@ info:
 	@echo "INETS_SPECS       = $(INETS_SPECS)"
 	@echo "INETS_FILES       = $(INETS_FILES)"
 	@echo ""
-	@echo "RELEASE_PATH      = $(RELEASE_PATH)"
-	@echo "RELSYSDIR         = $(RELSYSDIR)"
+	@echo "RELEASE_PATH      = "$(RELEASE_PATH)""
+	@echo "RELSYSDIR         = "$(RELSYSDIR)""
 	@echo "RELTESTSYSDIR     = $(RELTESTSYSDIR)"
 	@echo "RELTESTSYSALLDATADIR = $(RELTESTSYSALLDATADIR)"
 	@echo "RELTESTSYSBINDIR     = $(RELTESTSYSBINDIR)"
-- 
cgit v1.2.3