From 41b77d0c1352e569d861ed327fd523dd12efffae Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Tue, 15 Dec 2015 17:15:17 -0500
Subject: [PATCH] Use local versions of node modules instead of
 system-installed, add a 'build-it-all' target for building the whole client.

Fix two old typos.
---
 Makefile         | 10 +++++++++-
 client/README.md | 23 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 55dd9e26d8f..7b7d59b3104 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,15 @@ npm-deps:
 	cd client && npm install
 
 grunt: npm-deps
-	cd client && grunt
+	cd client && node_modules/grunt-cli/bin/grunt
+
+style: npm-deps
+	cd client && node_modules/grunt-cli/bin/grunt style
+
+webpack: npm-deps
+	cd client && node_modules/webpack/bin/webpack.js -p
+
+client: grunt style webpack
 
 grunt-docker-image:
 	docker build -t ${GRUNT_DOCKER_NAME} client
diff --git a/client/README.md b/client/README.md
index b3db1286f0a..e3337b872b5 100644
--- a/client/README.md
+++ b/client/README.md
@@ -4,9 +4,24 @@ Client Build System
 Builds and moves the client-side scripts necessary for running the Galaxy webapps. There's no need to use this system
 unless you are modifying or developing client-side scripts.
 
-You'll need Node and the Node Package Manager (npm): nodejs.org.
+The base dependencies you'll need are Node.js and the Node Package Manager
+(npm).  See nodejs.org for more information.
 
-Once npm is installed, install the grunt task manager and it's command line into your global scope:
+
+Simple Full Build
+=================
+
+The simplest way to rebuild the entire client to incorporate any local changes
+is to run the 'client' rule in the Galaxy makefile, which is in the repository
+root.  This will also ensure any local node modules are installed.
+
+    make client
+
+
+Detailed Build Instructions
+===========================
+
+Once npm is installed, install the grunt task manager and its command line into your global scope:
 
     npm install -g grunt grunt-cli
 
@@ -50,7 +65,7 @@ Changing Styles/CSS
 ===================
 
 The CSS and styling used by Galaxy is also controlled from this directory. Galaxy uses LESS, a superset of CSS that
-compiles to CSS, for its styling. LESS files are kept in client/galaxy/style/less. Compiled CSS is in statis/style/blue.
+compiles to CSS, for its styling. LESS files are kept in client/galaxy/style/less. Compiled CSS is in static/style/blue.
 
 Use grunt to recompile the LESS in into CSS (from the `client` directory):
 
@@ -91,4 +106,4 @@ The commands mentioned above in 'Rebuilding' and 'Grunt watch' also can be appli
 `--app=toolshed` option:
 
 	grunt watch --app=toolshed
-	grunt --app=toolshed
\ No newline at end of file
+	grunt --app=toolshed