X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=9ee3b804b3584d04a65442ef50c5eee2bc820314;hb=33587b3b07b0e4b8a9ce09d340114ded913722d2;hp=125efa7ca4d2ba8719e172b23ad5e6d013ab4b45;hpb=ac9e4a35a74918cd00feff5162d2e0e08c796d8f;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 125efa7..9ee3b80 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=	/usr/sbin/apache2
+APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
 
 all: check
 
@@ -32,7 +32,7 @@ clean-error:
 clean-tmp:
 	rm -rf ${TMP_DIR}
 	mkdir -p ${TMP_DIR}
-	touch ${TMP_DIR}/.gitignore
+	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
 	${MAKE} -C../src mkws-complete.min.js
@@ -103,5 +103,5 @@ help:
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"