aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Trevor Elliott <trevor@galois.com>2013-06-03 15:23:20 -0700
committerGravatar Trevor Elliott <trevor@galois.com>2013-06-03 15:23:20 -0700
commitd657e80429b4ea758316dc0a307afd2b480e45e4 (patch)
treeea165808e57c9594b7cace307f0b2d5f577c3567 /Makefile
parentb2e6343765872d981122b358afd76d81403c4240 (diff)
Add a Config.mk for build config
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1496ac9..2b57dfe 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,13 @@ path := .
include mk/util.mk
include mk/subdir.mk
+ifeq "$(shell ls ./Config.mk 2>/dev/null)" ""
+$(warning No Config.mk found, installing a default)
+Config.mk: Config.mk.sample
+ $(call cmd,cp)
+
+endif
+-include Config.mk
# Build Directory Staging ######################################################
@@ -89,10 +96,11 @@ endif
# JS Unit Tests ###############################################################
-PHANTOM_EXE := $(shell which phantomjs 2>/dev/null)
-ifneq "$PHANTOM_EXE" ""
+ifneq "$(PHANTOM_EXE)" ""
test-js:
- cd $(topdir)/contexts/data && $(PHANTOM_EXE) lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js tests/PhantomJSJasmineRunner.html tests/reports/
+ cd $(topdir)/contexts/data && $(PHANTOM_EXE) \
+ lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \
+ tests/PhantomJSJasmineRunner.html tests/reports/
endif