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/orber/COSS/CosNaming/Makefile | 10 +++++-----
 lib/orber/c_src/Makefile.in       | 24 ++++++++++++------------
 lib/orber/doc/src/Makefile        | 14 +++++++-------
 lib/orber/examples/Stack/Makefile |  4 ++--
 lib/orber/java_src/Orber/Makefile |  4 ++--
 lib/orber/priv/Makefile           |  4 ++--
 lib/orber/src/Makefile            | 12 ++++++------
 lib/orber/test/Makefile           | 12 ++++++------
 lib/orber/test/orber_test_lib.erl |  5 +++--
 9 files changed, 45 insertions(+), 44 deletions(-)

(limited to 'lib/orber')

diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
index 064447f148..a61fcd08a6 100644
--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
@@ -141,11 +141,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
-	$(INSTALL_DATA) $(GEN_FILES) $(RELSYSDIR)/COSS/CosNaming
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
 
 
 release_docs_spec:
diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in
index 56f0d57545..5953d41ff3 100644
--- a/lib/orber/c_src/Makefile.in
+++ b/lib/orber/c_src/Makefile.in
@@ -89,23 +89,23 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 ifeq ($(findstring win32,$(TARGET)),win32)
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_PROGRAM) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_PROGRAM) $(HH_FILES) $(RELSYSDIR)/priv/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
+	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 else
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_PROGRAM) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_PROGRAM) $(HH_FILES) $(RELSYSDIR)/priv/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
+	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 else
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_DATA) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_DATA) $(HH_FILES) $(RELSYSDIR)/priv/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
+	$(INSTALL_DATA) $(CC_FILES) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DATA) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 endif
 endif
 
diff --git a/lib/orber/doc/src/Makefile b/lib/orber/doc/src/Makefile
index 68fbe3dce0..c429c1d80b 100644
--- a/lib/orber/doc/src/Makefile
+++ b/lib/orber/doc/src/Makefile
@@ -164,13 +164,13 @@ debug opt:
 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_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
+		"$(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/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
index b985f348fa..b03d7c3b86 100644
--- a/lib/orber/examples/Stack/Makefile
+++ b/lib/orber/examples/Stack/Makefile
@@ -118,8 +118,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/Stack
-	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(CPP_FILES) $(IDL_FILES) $(RELSYSDIR)/examples/Stack
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/Stack"
+	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(CPP_FILES) $(IDL_FILES) "$(RELSYSDIR)/examples/Stack"
 
 
 release_docs_spec:
diff --git a/lib/orber/java_src/Orber/Makefile b/lib/orber/java_src/Orber/Makefile
index 49da975a8b..4e52ed3635 100644
--- a/lib/orber/java_src/Orber/Makefile
+++ b/lib/orber/java_src/Orber/Makefile
@@ -63,8 +63,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/Orber
-	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/Orber
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/Orber"
+	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/Orber"
 
 release_docs_spec:
 
diff --git a/lib/orber/priv/Makefile b/lib/orber/priv/Makefile
index af82177466..7957f7bbf0 100644
--- a/lib/orber/priv/Makefile
+++ b/lib/orber/priv/Makefile
@@ -58,8 +58,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(HELP_FILES) $(HTML_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(HELP_FILES) $(HTML_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index d2e98686da..a57d6d948b 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -254,12 +254,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
index d4be009af3..8eef1934a4 100644
--- a/lib/orber/test/Makefile
+++ b/lib/orber/test/Makefile
@@ -209,12 +209,12 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) $(COVER_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		$(RELSYSDIR)/$(IDLOUTDIR)
+		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 0ddde49cd6..2bfa1ef871 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -282,6 +282,7 @@ starter(Host, Name, Args) ->
         vxworks ->
             test_server:start_node(Name, slave, [{args,Args}]);
         _ ->
+	    io:format("slave:start_link(~p,~p,~p).~n",[Host,Name,Args]),
             slave:start_link(Host, Name, Args)
     end.
 
@@ -403,8 +404,8 @@ create_paths() ->
         filename:join(Path, "idl_output") ++
 	" -pa " ++
         filename:join(Path, "all_SUITE_data") ++
-        " -pa " ++
-        filename:dirname(code:which(orber)).
+        " -pa \"" ++
+        filename:dirname(code:which(orber))++"\"".
 
 %%------------------------------------------------------------
 %% function : destroy_node
-- 
cgit v1.2.3