From a0ae63d8c2983f17aa75b161bd25fa505af20a6c Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 12 Dec 2016 11:33:41 -0500 Subject: [PATCH] Set NODE_MODULES var for 'grunt charts', required due to the execution model here. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8589d05cd3f..932ed455269 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ PROJECT_URL?=https://github.com/galaxyproject/galaxy GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01 GRUNT_EXEC?=node_modules/grunt-cli/bin/grunt WEBPACK_EXEC?=node_modules/webpack/bin/webpack.js +NODE_PATH?=node_modules DOCS_DIR=doc DOC_SOURCE_DIR=$(DOCS_DIR)/source SLIDESHOW_DIR=$(DOC_SOURCE_DIR)/slideshow @@ -94,7 +95,7 @@ client-install-libs: npm-deps ## Fetch updated client dependencies using bower. client: grunt style ## Rebuild all client-side artifacts charts: npm-deps ## Rebuild charts - client/$(WEBPACK_EXEC) -p --config config/plugins/visualizations/charts/webpack.config.js + NODE_PATH=client/$(NODE_PATH) client/$(WEBPACK_EXEC) -p --config config/plugins/visualizations/charts/webpack.config.js grunt-docker-image: ## Build docker image for running grunt docker build -t ${GRUNT_DOCKER_NAME} client