Set src docs output directory to build

kgryte · kgryte · commit acca1e80b3b4 · 2016-06-02T16:51:39.000-07:00
diff --git a/Makefile b/Makefile
@@ -47,6 +47,9 @@ COVERAGE_DIR ?= $(REPORTS_DIR)/coverage
 # Define the directory for documentation:
 DOCS_DIR ?= $(ROOT_DIR)/docs
 
+# Define the directory for generated source code documentation:
+SRC_DOCS_DIR ?= $(BUILD_DIR)/docs
+
 # Define the top-level directory containing executables:
 LOCAL_BIN_DIR ?= $(ROOT_DIR)/bin
 
diff --git a/tools/make/lib/docs/documentationjs.mk b/tools/make/lib/docs/documentationjs.mk
@@ -27,7 +27,7 @@ DOCUMENTATIONJS ?= $(BIN_DIR)/documentation
 DOCUMENTATIONJS_TYPEDEF ?= $(TOOLS_DIR)/docs/jsdoc/typedefs/*.js
 
 # Define the output directory for documentation.js:
-DOCUMENTATIONJS_OUT ?= $(DOCS_DIR)/documentationjs
+DOCUMENTATIONJS_OUT ?= $(SRC_DOCS_DIR)/documentationjs
 
 # Define the output directory for documentation.js JSON:
 DOCUMENTATIONJS_JSON_OUT ?= $(DOCUMENTATIONJS_OUT)/json
diff --git a/tools/make/lib/docs/jsdoc.mk b/tools/make/lib/docs/jsdoc.mk
@@ -33,7 +33,7 @@ JSDOC_TYPEDEF ?= $(TOOLS_DIR)/docs/jsdoc/typedefs/*.js
 JSDOC_JSON_TEMPLATE ?= $(TOOLS_DIR)/docs/jsdoc/templates/json
 
 # Define the output directory for JSDoc:
-JSDOC_OUT ?= $(DOCS_DIR)/jsdoc
+JSDOC_OUT ?= $(SRC_DOCS_DIR)/jsdoc
 
 # Define the output directory for JSDoc JSON:
 JSDOC_JSON_OUT ?= $(JSDOC_OUT)/json
