Merge branch 'maint'

* maint:
  Update to work with space in include path
  Update to work with whitespace in exec path

3 files changed, 26 insertions, 26 deletions

diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index bc3e649e6b..cdf63e7fb6 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -162,18 +162,18 @@ include $(DIAMETER_TOP)/make/release_targets.mk
 endif
 
 release_docs_spec: $(LOCAL)docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(HTMLDIR)/*.* $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN4_FILES) $(RELEASE_PATH)/man/man4
-	[ -z "$(LOCAL)" ] || cp -r $(HTMLDIR)/js $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(HTMLDIR)/*.* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN4_FILES) "$(RELEASE_PATH)/man/man4"
+	[ -z "$(LOCAL)" ] || cp -r $(HTMLDIR)/js "$(RELSYSDIR)/doc/html"
 	echo $(LOCAL)
 
 release_spec:
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index dbfaa4e140..de2eca0279 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -195,27 +195,27 @@ endif
 
 release_spec: opt
 	for d in bin ebin include src/dict; do \
-	    $(INSTALL_DIR) $(RELSYSDIR)/$$d; \
+	    $(INSTALL_DIR) "$(RELSYSDIR)/$$d"; \
 	done
-	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) $(RELSYSDIR)/bin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) "$(RELSYSDIR)/bin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(EXTERNAL_HRLS:%=../include/%) $(DICT_HRLS) \
-	                $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) $(RELSYSDIR)/src/dict
+	                "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) "$(RELSYSDIR)/src/dict"
 	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
 
 $(TARGET_DIRS:%/=release_src_%): release_src_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/src/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
 	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
 	                               $(INTERNAL_HRLS)) \
 	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
-	                $(RELSYSDIR)/src/$*
+	                "$(RELSYSDIR)/src/$*"
 
 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
 	$(INSTALL_DATA) $(patsubst %, ../examples/%, $(filter $*/%, $(EXAMPLES))) \
-	                $(RELSYSDIR)/examples/$*
+	                "$(RELSYSDIR)/examples/$*"
 
 release_docs_spec:
 
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index ab5b45ff3d..1659330a91 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -141,7 +141,7 @@ log:
 # ---------------------------------------------------- 
 
 /%: % force
-	sed -f release.sed $< > $(RELSYSDIR)$@
+	sed -f release.sed $< > "$(RELSYSDIR)$@"
 
 ifeq ($(ERL_TOP),)
 include $(DIAMETER_TOP)/make/release_targets.mk
@@ -152,17 +152,17 @@ endif
 release_spec release_docs_spec:
 
 release_tests_spec:
-	$(INSTALL_DIR)  $(RELSYSDIR)
+	$(INSTALL_DIR)  "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
 	                $(COVER_SPEC_FILE) \
 	                $(HRL_FILES) \
-	                $(RELSYSDIR)
+	                "$(RELSYSDIR)"
 	$(MAKE) $(DATA_DIRS:%/=release_data_%)
 	$(MAKE) $(ERL_FILES:%=/%)
 
 $(DATA_DIRS:%/=release_data_%): release_data_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/$*
-	$(INSTALL_DATA) $(filter $*/%, $(DATA)) $(RELSYSDIR)/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/$*"
+	$(INSTALL_DATA) $(filter $*/%, $(DATA)) "$(RELSYSDIR)/$*"
 
 force: