X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=a1142b12ce80a713e934eaccf38bda8d20b5cdf0;hb=3b7fb27a298b5fe7be9a7a425b0973484decd4e0;hp=668d855f9205ba5a6a67c2e41427b5e8eef21c0e;hpb=54f01e1910f918a990a38c6108356f27dbc7b049;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 668d855..a1142b1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,6 +14,7 @@ IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bomb.pl
 TMP_DIR=	./logs
+APACHE_HTTPD=	/usr/sbin/apache2
 
 all: check
 
@@ -75,7 +76,7 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	/usr/sbin/apache2 -f `pwd`/${TMP_DIR}/jasmine-dev
+	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
 	
 apache-stop:
 	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
@@ -92,5 +93,5 @@ help:
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"