fix conditional PHP var lost in transition; fix prefix for job

diff --git a/Makefile b/Makefile
index 1bc8fefc523922c4dbf4d94eafd662c36bf5144e..20bcbbcf45f8ffe0efcb40305f7675d7bc9c8bf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 export
 
-PHP = 5.6
+PHP ?= 5.6
 JOBS ?= 2
 PHP_MIRROR ?= http://us1.php.net/distributions/
 
-prefix ?= $(HOME)
-prefix += /job-$(TRAVIS_JOB_NUMBER)
+prefix ?= $(HOME)/job-$(TRAVIS_JOB_NUMBER)
 exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))