Merge branch 'master' of ssh://git.funkthat.com:822/jmg/solardash

Makefile

@@ -5,6 +5,11 @@ PROJNAME=solardash
 VIRTUALENV ?= virtualenv-3.7
 VRITUALENVARGS =
 
+CPP ?= cpp
+HOST ?= localhost
+
+RAINEAGLEDATAPREF ?= p/src/raineagle/fixtures/data
+
 FILES=$(PROJNAME)/__init__.py
 
 JSFILES = root/js/solardash.file.js root/js/solardash.https.js root/js/solardash.http.js
@@ -32,7 +37,7 @@ all: $(JSFILES)
 run: $(JSFILES)
 
 .jspp.js:
-	cpp -Wno-invalid-pp-token -E $< | sed -e '/^#/d' > $@ || (rm "$@"; false)
+	$(CPP) -Wno-invalid-pp-token -E $< | sed -e '/^#/d' > $@ || (rm "$@"; false)
 
 keepupdate:
 	find . -name '*.js' -o -name '*.jspp' | entr make all
@@ -44,7 +49,7 @@ test-noentr:
 	python -m coverage run -m unittest $(PROJNAME) && coverage report --omit=p/\* -m -i
 
 run: $(JSFILES)
-	python -m aiohttp.web -H localhost -P 38382 solardash:getapp p/src/raineagle/fixtures/data
+	python -m aiohttp.web -H $(HOST) -P 38382 solardash:getapp $(RAINEAGLEDATAPREF)
 
 env:
 	($(VIRTUALENV) $(VIRTUALENVARGS) p && . ./p/bin/activate && pip install -r requirements.txt)