From 249b42a29dd6c93eaadd321ae1f6d95cd7b4382e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 26 Mar 2014 11:51:05 +0100
Subject: [PATCH] move node modules to bin/ folder to fix build

---
 .gitignore                       | 2 +-
 Makefile                         | 6 +++---
 package.json => bin/package.json | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename package.json => bin/package.json (100%)

diff --git a/.gitignore b/.gitignore
index 2f1e1b2b8..bc11cf95a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 /config.gypi
 /config.mk
 /build
-/node_modules
+/bin/node_modules
 /include/llmr/shader/shaders.hpp
 /include/llmr/style/resources.hpp
 /src/shader/shaders.cpp
diff --git a/Makefile b/Makefile
index 3038bbc94..5e492a2a2 100644
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,10 @@ test: deps config.gypi src test/test.gyp
 		$${FILE}; \
 	done
 
-glsl-optimizer: node_modules/glsl-optimizer/build/Release/glslOptimizer.node
+glsl-optimizer: bin/node_modules/glsl-optimizer/build/Release/glslOptimizer.node
 
-node_modules/glsl-optimizer/build/Release/glslOptimizer.node:
-	npm install
+bin/node_modules/glsl-optimizer/build/Release/glslOptimizer.node:
+	cd bin && npm install
 
 clean:
 	-rm -rf out
diff --git a/package.json b/bin/package.json
similarity index 100%
rename from package.json
rename to bin/package.json