projects
/
m6w6
/
travis-pecl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
897a8b2
)
not sure where I thought that CURDIR came from
author
Michael Wallner
<mike@php.net>
Fri, 22 Jan 2016 13:20:08 +0000
(14:20 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 22 Jan 2016 13:20:08 +0000
(14:20 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 19584a01103efaa2c9ec7e9c1388d66c59b2eb87..c1990ac1dcf1554eaf17a85b3381df7cf2952051 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,6
+12,11
@@
endif
exec_prefix ?= $(prefix)
bindir = $(exec_prefix)/bin
srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
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
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-clean: pecl-clean
.PHONY: ext-rm
-ext-rm: PECL_DIR:=$(
CURDIR
)
+ext-rm: PECL_DIR:=$(
curdir
)
ext-rm: pecl-rm
.PHONY: ext
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
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
test: php
REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests