From: Michael Wallner <mike@php.net>
Date: Fri, 22 Jan 2016 13:20:08 +0000 (+0100)
Subject: not sure where I thought that CURDIR came from
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1903e5867ae79f3e88d2c31aecdbe0bd229f02bd;p=m6w6%2Ftravis-pecl

not sure where I thought that CURDIR came from
---

diff --git a/Makefile b/Makefile
index 19584a0..c1990ac 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,11 @@ endif
 exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+ifdef TRAVIS_BUILD_DIR
+curdir ?= $(TRAVIS_BUILD_DIR)
+else
+curdir ?= .
+endif
 
 enable_maintainer_zts ?= no
 enable_debug ?= no
@@ -117,16 +122,16 @@ pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)
 ext-clean: pecl-clean
 
 .PHONY: ext-rm
-ext-rm: PECL_DIR:=$(CURDIR)
+ext-rm: PECL_DIR:=$(curdir)
 ext-rm: pecl-rm
 
 .PHONY: ext
-ext: PECL_DIR:=$(CURDIR)
+ext: PECL_DIR:=$(curdir)
 ext: pecl-check pecl
 	$(srcdir)/check-packagexml.php package.xml
 
 .PHONY: php
-test: PECL_DIR:=$(CURDIR)
+test: PECL_DIR:=$(curdir)
 test: php
 	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests