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/ic/c_src/Makefile.in                     | 12 +++----
 lib/ic/doc/src/Makefile                      | 14 ++++----
 lib/ic/examples/pre_post_condition/Makefile  |  4 +--
 lib/ic/java_src/com/ericsson/otp/ic/Makefile |  8 ++---
 lib/ic/src/Makefile                          | 34 +++++++++----------
 lib/ic/test/Makefile                         | 50 ++++++++++++++--------------
 lib/ic/test/java_client_erl_server_SUITE.erl |  2 +-
 7 files changed, 62 insertions(+), 62 deletions(-)

(limited to 'lib/ic')

diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index 5e034c47c6..d8b8c85a8e 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -140,12 +140,12 @@ $(OBJDIR)/%.o: %.c
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
 
 release_docs_spec:
 
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index 208f16e441..0ee242b234 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -220,12 +220,12 @@ 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_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	(/bin/cp -rf  $(HTMLDIR) $(RELSYSDIR)/doc)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
index 8f85babb1a..8ae37394ed 100644
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ b/lib/ic/examples/pre_post_condition/Makefile
@@ -124,8 +124,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/pre_post_condition
-	$(INSTALL_DATA) $(ERL_FILES) $(IDL_FILES) $(TXT_FILES) $(RELSYSDIR)/examples/pre_post_condition
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/pre_post_condition"
+	$(INSTALL_DATA) $(ERL_FILES) $(IDL_FILES) $(TXT_FILES) "$(RELSYSDIR)/examples/pre_post_condition"
 
 
 release_docs_spec:
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
index f730749ccb..1b14d4430f 100644
--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
@@ -109,10 +109,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
-	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
index 5dac304e32..c830ebec95 100644
--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
@@ -196,23 +196,23 @@ 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)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-client
-	$(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-server
-	$(INSTALL_DATA) $(CSRV_EX_FILES) $(RELSYSDIR)/examples/c-server	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DATA) $(EPL_EX_FILES) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-genserv
-	$(INSTALL_DATA) $(ESRV_EX_FILES) $(RELSYSDIR)/examples/erl-genserv	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DATA) $(JAVA_EX_FILES) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/all-against-all
-	$(INSTALL_DATA) $(MIXED_EX_FILES) $(RELSYSDIR)/examples/all-against-all
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DATA) $(CSRV_EX_FILES) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DATA) $(EPL_EX_FILES) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DATA) $(ESRV_EX_FILES) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DATA) $(JAVA_EX_FILES) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/all-against-all"
+	$(INSTALL_DATA) $(MIXED_EX_FILES) "$(RELSYSDIR)/examples/all-against-all"
 
 release_docs_spec:
 
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
index 1d90a1bc17..65003d703b 100644
--- a/lib/ic/test/Makefile
+++ b/lib/ic/test/Makefile
@@ -239,39 +239,39 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_register_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_pragma_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_pp_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_be_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_proto_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/java_client_erl_server_SUITE_data
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_register_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pragma_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pp_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_be_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_client_erl_server_SUITE_data"
 	$(INSTALL_DATA) $(IDL_FILES)  ic.cover $(TEST_SPEC_FILE) $(ERL_FILES) \
-		$(RELSYSDIR)
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES) $(RELSYSDIR)/ic_SUITE_data
+		"$(RELSYSDIR)"
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES) "$(RELSYSDIR)/ic_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES2) \
-		$(RELSYSDIR)/ic_register_SUITE_data
+		"$(RELSYSDIR)/ic_register_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES3) \
-		$(RELSYSDIR)/ic_pragma_SUITE_data
+		"$(RELSYSDIR)/ic_pragma_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES4) \
-		$(RELSYSDIR)/ic_be_SUITE_data	
+		"$(RELSYSDIR)/ic_be_SUITE_data"
 	$(INSTALL_DATA) $(PREPROCESSOR_TEST_FILES) \
-		$(RELSYSDIR)/ic_pp_SUITE_data	
+		"$(RELSYSDIR)/ic_pp_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
 	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/erl_client_c_server_SUITE_data	
+		"$(RELSYSDIR)/erl_client_c_server_SUITE_data"
 	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_PROTO_TEST_FILES) \
-		$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data	
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+		"$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(JAVA_CLIENT_ERL_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/java_client_erl_server_SUITE_data
+		"$(RELSYSDIR)/java_client_erl_server_SUITE_data"
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index 407c3d2d44..d4523dc2ad 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -249,7 +249,7 @@ marshal_any_2(Config) when is_list(Config) ->
 
 
 java(Java, Dir, ClassAndArgs) ->
-    cmd(Java++" -classpath "++classpath(Dir)++" "++ClassAndArgs).
+    cmd(Java++" -classpath \""++classpath(Dir)++"\" "++ClassAndArgs).
 
 java(Java, Dir, Class, Args) ->
     java(Java, Dir, Class++" "++to_string(Args)).
-- 
cgit v1.2.3