X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2FMakefile;h=7d9152269ae7aa46c1918c137318b390401d1d72;hb=b00013fe39e1d0299c8760c14cc7900e35e2e56b;hp=9ab19f05e81159eda6ac35a116d475c0dc0ac5ae;hpb=002850e798def87c2ca04fbc449e9a221bb52afd;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 9ab19f0..7d91522 100644 --- a/test/Makefile +++ b/test/Makefile @@ -14,7 +14,7 @@ IMAGES= ./images SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048 PERL_SCRIPTS= bin/bomb.pl TMP_DIR= ./logs -APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false) +APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 ) all: check @@ -35,7 +35,7 @@ clean-tmp: touch ${TMP_DIR}/.gitkeep mkws-complete-syntax-check: - ${MAKE} -C../src mkws-complete.min.js + ${MAKE} -C../tools/htdocs mkws-complete.min.js check: mkws-complete-syntax-check @if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi