From 90a89c42200225cfe50dbb6b822ca7d6de3c85c7 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Thu, 14 Apr 2016 16:16:27 -0700
Subject: [PATCH] Revert "Back to installing npm modules individually."

It causes the npm-shrinkwrap.json to be ignored.
This reverts commit 4dbff13ebf253eda36b2de6f8f17b49c868a471c.
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6b14798e2..cc9225673 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,8 @@ imports := \
  .tests_enabled
 
 imports_font_awesome := \
- node_modules/font-awesome/package.json
+ node_modules/font-awesome/css/font-awesome.css \
+ node_modules/font-awesome/fonts/fontawesome-webfont.woff
 imports_style := \
  $(wildcard src/Linkification/icons/*.png)
 
@@ -104,11 +105,11 @@ all : jshint bds install
 .events tmp testbuilds builds :
 	$(MKDIR)
 
-.events/npm.% : npm-shrinkwrap.json | .events
-	npm install $*
+.events/npm : npm-shrinkwrap.json | .events
+	npm install
 	echo -> $@
 
-node_modules/%/package.json : .events/npm.%
+node_modules/% : .events/npm
 	
 
 .tests_enabled :