aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-06-08 17:33:41 +0200
committerLukas Larsson <[email protected]>2012-06-08 17:33:41 +0200
commit1fc1233587a00b318ce15fd520b057dee726a7fc (patch)
tree1a7c446ee60b922fb11c89c930f32f55719015f1 /system
parentd7554d5b53ef85861bb5593fba38f65c40faca33 (diff)
parent3341122a92e71ade3edc7ecaadab9f55da29e20d (diff)
downloadotp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.gz
otp-1fc1233587a00b318ce15fd520b057dee726a7fc.tar.bz2
otp-1fc1233587a00b318ce15fd520b057dee726a7fc.zip
Merge branch 'maint'
* maint: Update to work with space in include path Update to work with whitespace in exec path
Diffstat (limited to 'system')
-rw-r--r--system/doc/design_principles/Makefile6
-rw-r--r--system/doc/efficiency_guide/Makefile6
-rw-r--r--system/doc/embedded/Makefile6
-rw-r--r--system/doc/getting_started/Makefile6
-rw-r--r--system/doc/installation_guide/Makefile2
-rw-r--r--system/doc/oam/Makefile2
-rw-r--r--system/doc/programming_examples/Makefile2
-rw-r--r--system/doc/reference_manual/Makefile6
-rw-r--r--system/doc/system_architecture_intro/Makefile6
-rw-r--r--system/doc/system_principles/Makefile6
-rw-r--r--system/doc/top/Makefile6
-rw-r--r--system/doc/tutorial/Makefile6
12 files changed, 30 insertions, 30 deletions
diff --git a/system/doc/design_principles/Makefile b/system/doc/design_principles/Makefile
index bffff75be2..a9d4665ee4 100644
--- a/system/doc/design_principles/Makefile
+++ b/system/doc/design_principles/Makefile
@@ -29,7 +29,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/design_principles
+RELSYSDIR = "$(RELEASE_PATH)/doc/design_principles"
# ----------------------------------------------------
# Target Specs
@@ -105,8 +105,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/efficiency_guide/Makefile b/system/doc/efficiency_guide/Makefile
index c08a9d2f69..1fd7b36453 100644
--- a/system/doc/efficiency_guide/Makefile
+++ b/system/doc/efficiency_guide/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/efficiency_guide
+RELSYSDIR = "$(RELEASE_PATH)/doc/efficiency_guide"
# ----------------------------------------------------
# Target Specs
@@ -106,8 +106,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/embedded/Makefile b/system/doc/embedded/Makefile
index 7dda0eaaa7..825fb23cfe 100644
--- a/system/doc/embedded/Makefile
+++ b/system/doc/embedded/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/embedded
+RELSYSDIR = "$(RELEASE_PATH)/doc/embedded"
# ----------------------------------------------------
# Target Specs
@@ -94,8 +94,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/getting_started/Makefile b/system/doc/getting_started/Makefile
index 62b92613e5..972a51d3a5 100644
--- a/system/doc/getting_started/Makefile
+++ b/system/doc/getting_started/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/getting_started
+RELSYSDIR = "$(RELEASE_PATH)/doc/getting_started"
# ----------------------------------------------------
# Target Specs
@@ -93,8 +93,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile
index a47d77604d..4636650570 100644
--- a/system/doc/installation_guide/Makefile
+++ b/system/doc/installation_guide/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/installation_guide
+RELSYSDIR = "$(RELEASE_PATH)/doc/installation_guide"
REDIRECT_HTML_RELSYSDIR = $(RELSYSDIR)/source
# ----------------------------------------------------
diff --git a/system/doc/oam/Makefile b/system/doc/oam/Makefile
index 510877b189..f459f4349f 100644
--- a/system/doc/oam/Makefile
+++ b/system/doc/oam/Makefile
@@ -29,7 +29,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/oam
+RELSYSDIR = "$(RELEASE_PATH)/doc/oam"
# ----------------------------------------------------
# Target Specs
diff --git a/system/doc/programming_examples/Makefile b/system/doc/programming_examples/Makefile
index 41a65273db..fcc51e3b18 100644
--- a/system/doc/programming_examples/Makefile
+++ b/system/doc/programming_examples/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/programming_examples
+RELSYSDIR = "$(RELEASE_PATH)/doc/programming_examples"
# ----------------------------------------------------
# Target Specs
diff --git a/system/doc/reference_manual/Makefile b/system/doc/reference_manual/Makefile
index 8de9c39d03..87a477d14e 100644
--- a/system/doc/reference_manual/Makefile
+++ b/system/doc/reference_manual/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/reference_manual
+RELSYSDIR = "$(RELEASE_PATH)/doc/reference_manual"
# ----------------------------------------------------
# Target Specs
@@ -103,8 +103,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/system_architecture_intro/Makefile b/system/doc/system_architecture_intro/Makefile
index 9cf135a6f9..2de67473c1 100644
--- a/system/doc/system_architecture_intro/Makefile
+++ b/system/doc/system_architecture_intro/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/system_architecture_intro
+RELSYSDIR = "$(RELEASE_PATH)/doc/system_architecture_intro"
# ----------------------------------------------------
# Target Specs
@@ -88,8 +88,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/system_principles/Makefile b/system/doc/system_principles/Makefile
index da37bd53cf..4b7fc8f177 100644
--- a/system/doc/system_principles/Makefile
+++ b/system/doc/system_principles/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/system_principles
+RELSYSDIR = "$(RELEASE_PATH)/doc/system_principles"
# ----------------------------------------------------
# Target Specs
@@ -87,8 +87,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 9f69a7210b..bbdb4d7055 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc
+RELSYSDIR = "$(RELEASE_PATH)/doc"
GIF_FILES =
@@ -233,8 +233,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
- $(INSTALL_DIR) $(RELEASE_PATH)
- $(INSTALL_DATA) $(INFO_FILES) $(RELEASE_PATH)
+ $(INSTALL_DIR) "$(RELEASE_PATH)"
+ $(INSTALL_DATA) $(INFO_FILES) "$(RELEASE_PATH)"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DIR) $(RELSYSDIR)/pdf
$(INSTALL_DATA) \
diff --git a/system/doc/tutorial/Makefile b/system/doc/tutorial/Makefile
index d91d98481d..e9eb800e46 100644
--- a/system/doc/tutorial/Makefile
+++ b/system/doc/tutorial/Makefile
@@ -30,7 +30,7 @@ APPLICATION=otp-system-documentation
# ----------------------------------------------------
# Release directory specification
# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/doc/tutorial
+RELSYSDIR = "$(RELEASE_PATH)/doc/tutorial"
# ----------------------------------------------------
# Target Specs
@@ -114,8 +114,8 @@ clean clean_docs:
include $(ERL_TOP)/make/otp_release_targets.mk
release_docs_spec: docs
-# $(INSTALL_DIR) $(RELEASE_PATH)/pdf
-# $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
+# $(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+# $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTMLDIR)/*.html \
$(RELSYSDIR)