From 3f4cac445f9891e98bb7c6bba3916ab03bedd958 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Wed, 13 Apr 2016 22:04:50 -0700 Subject: [PATCH 1/2] Cygwin compatibility. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d72748a58..cc9225673 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ name := 4chan-X -ifeq "$(OS)" "Windows_NT" +ifdef ComSpec BIN := $(subst /,\,node_modules/.bin/) RMDIR := -rmdir /s /q RM := -del From 4dbff13ebf253eda36b2de6f8f17b49c868a471c Mon Sep 17 00:00:00 2001 From: ccd0 Date: Wed, 13 Apr 2016 22:16:29 -0700 Subject: [PATCH 2/2] Back to installing npm modules individually. --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cc9225673..6b14798e2 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,7 @@ imports := \ .tests_enabled imports_font_awesome := \ - node_modules/font-awesome/css/font-awesome.css \ - node_modules/font-awesome/fonts/fontawesome-webfont.woff + node_modules/font-awesome/package.json imports_style := \ $(wildcard src/Linkification/icons/*.png) @@ -105,11 +104,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/% : .events/npm +node_modules/%/package.json : .events/npm.% .tests_enabled :