From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 7 Apr 2014 15:35:11 +0000 (+0000)
Subject: new variable APACHE_HTTPD
X-Git-Tag: 1.0.0~995^2~11
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=77fe60135f3526111f8cc3922af1bd3bc77e6f8c;hp=54f01e1910f918a990a38c6108356f27dbc7b049

new variable APACHE_HTTPD
---

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}"