From: Michael Wallner <mike@php.net>
Date: Fri, 31 Jul 2015 07:19:08 +0000 (+0200)
Subject: fix conditional PHP var lost in transition; fix prefix for job
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a1608cd360ed99656bc420fa957a5e3213f1d573;p=m6w6%2Fpecl-ci

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

diff --git a/Makefile b/Makefile
index 1bc8fef..20bcbbc 100644
--- 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)))