Fixed some paths in Makefile and a rule for linting

sozi-projects · Aug 17, 2012 · b20b43a · b20b43a
1 parent 9501d70
commit b20b43a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 
 VERSION := $(shell date +%y.%m-%d%H%M%S)
 
-PLAYER_JS := $(wildcard ../player/js/*.js)
-EXTRAS_JS := $(wildcard ../player/extras/*.js)
+PLAYER_JS := $(wildcard player/js/*.js)
+EXTRAS_JS := $(wildcard player/extras/*.js)
 
 #MINIFY_OPT += --nomunge
 
@@ -12,7 +12,7 @@ JUICER_OPT += --skip-verification
 
 MINIFY := juicer merge $(JUICER_OPT) --arguments "$(MINIFY_OPT)"
 
-AUTOLINT := ../node_modules/autolint/bin/autolint
+AUTOLINT := ./node_modules/autolint/bin/autolint
 
 MSGFMT := /usr/lib/python2.7/Tools/i18n/msgfmt.py
 

diff --git a/autolint.js b/autolint.js
@@ -4,7 +4,7 @@ module.exports = {
     linterOptions: {
         onevar: false,  // Allow multiple "var" statements
         forin: false,   // For-in statements need not filter
-        predef: [ "module", "sozi" ]
+        predef: [ "namespace", "sozi" ]
     },
     excludes: []
 };