Set NODE_PATH env var and quote env vars

kgryte · kgryte · commit 370b1ef00fa0 · 2018-01-18T21:10:00.000-08:00
diff --git a/tools/make/lib/init/eslint.mk b/tools/make/lib/init/eslint.mk
@@ -45,7 +45,7 @@ BROWSERIFY_STDLIB_CUSTOM_ESLINT_RULES_PLUGIN_FLAGS ?= \
 
 init-stdlib-custom-eslint-rules-plugin: $(NODE_MODULES)
 	$(QUIET) $(MKDIR_RECURSIVE) $(STDLIB_CUSTOM_ESLINT_RULES_PLUGIN_OUT)
-	$(QUIET) NODE_PATH=$(NODE_PATH) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" \
 	$(BROWSERIFY) \
 		$(STDLIB_CUSTOM_ESLINT_RULES_PLUGIN_ENTRY) \
 		$(BROWSERIFY_STDLIB_CUSTOM_ESLINT_RULES_PLUGIN_FLAGS)
diff --git a/tools/make/lib/licenses/check.mk b/tools/make/lib/licenses/check.mk
@@ -50,7 +50,7 @@ CHECK_LICENSES_PRODUCTION ?= \
 # This target checks the license for each package dependency against a list of permitted licenses.
 
 check-licenses: $(NODE_MODULES)
-	$(QUIET) $(CHECK_LICENSES)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(CHECK_LICENSES)
 
 .PHONY: check-licenses
 
@@ -60,6 +60,6 @@ check-licenses: $(NODE_MODULES)
 # This target checks the license for each package dependency against a list of permitted licenses.
 
 check-licenses-production: $(NODE_MODULES)
-	$(QUIET) $(CHECK_LICENSES_PRODUCTION)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(CHECK_LICENSES_PRODUCTION)
 
 .PHONY: check-licenses-production
diff --git a/tools/make/lib/licenses/ls.mk b/tools/make/lib/licenses/ls.mk
@@ -23,7 +23,7 @@
 # This target lists the license for each package dependency in the package dependency tree.
 
 list-licenses: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
@@ -37,7 +37,7 @@ list-licenses: $(NODE_MODULES)
 # This target groups the licenses of package dependencies by license type.
 
 list-licenses-group: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
@@ -51,7 +51,7 @@ list-licenses-group: $(NODE_MODULES)
 # This target lists the license for each root package dependency.
 
 list-deps-licenses: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 		--depth 0 \
 	| $(INFER_LICENSES) \
@@ -66,7 +66,7 @@ list-deps-licenses: $(NODE_MODULES)
 # This target lists packages missing license information.
 
 list-missing-licenses: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
@@ -80,7 +80,7 @@ list-missing-licenses: $(NODE_MODULES)
 # This target lists packages having ambiguous license information.
 
 list-ambiguous-licenses: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
@@ -94,7 +94,7 @@ list-ambiguous-licenses: $(NODE_MODULES)
 # This target lists packages excluded license information.
 
 list-excluded-licenses: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
@@ -109,7 +109,7 @@ list-excluded-licenses: $(NODE_MODULES)
 # This target summaries package dependency license information.
 
 list-licenses-summary: $(NODE_MODULES)
-	$(QUIET) $(LIST_LICENSES) \
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(LIST_LICENSES) \
 		--dir $(ROOT_DIR) \
 	| $(INFER_LICENSES) \
 		$(INFER_LICENSES_FLAGS) \
