Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maint

* lukas/otp/install_with_whitespace/OTP-10107:
  Update to work with space in include path
  Update to work with whitespace in exec path

4 files changed, 46 insertions, 40 deletions

diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile
index e05b647cb2..2bad8976b5 100644
--- a/lib/erl_interface/doc/src/Makefile
+++ b/lib/erl_interface/doc/src/Makefile
@@ -113,16 +113,16 @@ clean clean_docs clean_tex:
 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/man1
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index d6b0ca1f16..661dbb68ac 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -843,32 +843,32 @@ EXTRA = \
 	$(TARGET)/eidefs.mk
 
 release: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/lib
-	$(INSTALL_DIR) $(RELSYSDIR)/bin
-	$(INSTALL_DIR) $(RELSYSDIR)/src/auxdir
-	$(INSTALL_DIR) $(RELSYSDIR)/src/connect
-	$(INSTALL_DIR) $(RELSYSDIR)/src/decode
-	$(INSTALL_DIR) $(RELSYSDIR)/src/encode
-	$(INSTALL_DIR) $(RELSYSDIR)/src/epmd
-	$(INSTALL_DIR) $(RELSYSDIR)/src/legacy
-	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
-	$(INSTALL_DIR) $(RELSYSDIR)/src/prog
-	$(INSTALL_DIR) $(RELSYSDIR)/src/registry
-	$(INSTALL_DATA) $(HEADERS)     $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/lib"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/connect"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/decode"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/encode"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/epmd"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/legacy"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
 ifneq ($(EXE_TARGETS),)
-	$(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin
-endif
-	$(INSTALL_DATA) $(EXTRA)        $(RELSYSDIR)/src
-	$(INSTALL_DATA) connect/*.[ch]  $(RELSYSDIR)/src/connect
-	$(INSTALL_DATA) decode/*.[ch]   $(RELSYSDIR)/src/decode
-	$(INSTALL_DATA) encode/*.[ch]   $(RELSYSDIR)/src/encode
-	$(INSTALL_DATA) epmd/*.[ch]     $(RELSYSDIR)/src/epmd
-	$(INSTALL_DATA) misc/*.[ch]     $(RELSYSDIR)/src/misc
-	$(INSTALL_DATA) registry/*.[ch] $(RELSYSDIR)/src/registry
-	$(INSTALL_DATA) legacy/*.[ch]   $(RELSYSDIR)/src/legacy
-	$(INSTALL_DATA) prog/*.[ch]     $(RELSYSDIR)/src/prog
+	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+endif
+	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
+	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
+	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
+	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
+	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
+	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
 
 release_docs:
 
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 4faf89c0d6..d11a138844 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -71,9 +71,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec:
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/erl_interface/test/all_SUITE_data/gccifier.c b/lib/erl_interface/test/all_SUITE_data/gccifier.c
index a6b8a340a1..a1019f9a72 100644
--- a/lib/erl_interface/test/all_SUITE_data/gccifier.c
+++ b/lib/erl_interface/test/all_SUITE_data/gccifier.c
@@ -73,17 +73,23 @@ save_arg(args_t *args, char *arg1, ...)
 	    args->vec = (char **) (args->no
 				   ? realloc((void *) args->vec,
 					     (sizeof(char *)
-					      *(args->no + ARGS_INCR + 1)))
+					      *(args->no + ARGS_INCR + 2)))
 				   : malloc((sizeof(char *)
-					     *(args->no + ARGS_INCR + 1))));
+					     *(args->no + ARGS_INCR + 2))));
 	    if (!args->vec)
 		enomem();
 	    args->no += ARGS_INCR;
 	}
+	if (carg == arg1) {
+	  args->vec[args->ix++] = "\"";
+	  args->chars++;
+	}
 	args->vec[args->ix++] = carg;
 	args->chars += strlen(carg);
 	carg = va_arg(argp, char *);
     }
+    args->vec[args->ix++] = "\"";
+    args->chars++;
     args->vec[args->ix++] = " ";
     args->chars++;
     va_end(argp);