X-Git-Url: https://git.yukkurigames.com/?p=string-lerp.git;a=blobdiff_plain;f=Makefile;h=22b272f653fc1913ce2f218573befcd451d56d94;hp=fb4849c1923eaae3713d274424aa244c859f28c8;hb=c66da5a020f5a229bc944b08e682636d1b3ecb98;hpb=44701cf13e95447d7fb12d21884860a02289c41e

diff --git a/Makefile b/Makefile
index fb4849c..22b272f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,10 @@ PKGNAME := string-lerp
 
 fallback = $(firstword $(shell command -v $(1)) $(2))
 
-git = $(shell GIT_DIR=$(firstword $(2) $(srcdir) .)/.git $(GIT) $(1))
-git_ls-tree = $(call git,ls-tree -r --name-only $(1),$(2))
-git_tag = $(call git,name-rev --tags --name-only $(call git,rev-parse $(1),$(2)),$(2))
-
 GIT ?= git
+git_ls-tree = $(shell $(GIT) ls-tree -r --name-only $(1))
+git_tag = $(shell $(GIT) name-rev --tags --name-only $(shell $(GIT) rev-parse $(1)))
+
 NPM ?= npm
 NPMBINDIR := ./node_modules/.bin
 JSTEST ?= $(NPMBINDIR)/jstest
@@ -17,6 +16,8 @@ UGLIFY ?= $(call fallback,uglifyjs,$(NPMBINDIR)/uglifyjs)
 SOURCES := string-lerp.js
 UGLIFIED = $(SOURCES:.js=.min.js)
 
+JSHINTFLAGS += --config tests/jshint.config
+
 TESTS = $(wildcard tests/*.js)
 LINT_TARGETS = $(patsubst %.js,build/stamp/%.lint,$(SOURCES))
 TEST_TARGETS = $(patsubst %.js,build/stamp/%.test,$(SOURCES)) \
@@ -39,7 +40,7 @@ all:
 
 build/stamp/%.lint: %.js | $(JSHINT)
 	@mkdir -p $(@D)
-	$(JSHINT) $<
+	$(JSHINT) $(JSHINTFLAGS) $<
 	@touch $@
 
 build/stamp/%.test: tests/%.js %.js | $(JSTEST)
@@ -68,12 +69,12 @@ build/dist/$(PKGNAME)-undefined.zip build/dist/$(PKGNAME)-undefined.tar.gz:
 .SECONDEXPANSION:
 build/dist/$(PKGNAME)-%.zip: $$(call git_ls-tree,$$*)
 	@mkdir -p $(@D)
-	$(GIT) archive --prefix=$(PKGNAME)-$*/ --output=$@ $*
+	$(GIT) archive --prefix=$(PKGNAME)-$*/ --output=$@ $* || ($(RM) $@ && exit 1)
 
 .SECONDEXPANSION:
 build/dist/$(PKGNAME)-%.tar.gz: $$(call git_ls-tree,$$*)
 	@mkdir -p $(@D)
-	$(GIT) archive --prefix=$(PKGNAME)-$*/ --output=$@ $*
+	$(GIT) archive --prefix=$(PKGNAME)-$*/ --output=$@ $* || ($(RM) $@ && exit 1)
 
 dist: check $(addprefix build/dist/$(PKGNAME)-$(call git_tag,HEAD),.zip .tar.gz)