projects
/
m6w6
/
ext-pq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
ee1c068
)
try this, sh
author
Michael Wallner
<mike@php.net>
Thu, 30 Jul 2015 16:49:32 +0000
(18:49 +0200)
committer
Michael Wallner
<mike@php.net>
Thu, 30 Jul 2015 16:49:32 +0000
(18:49 +0200)
travis/pecl/Makefile
patch
|
blob
|
history
diff --git
a/travis/pecl/Makefile
b/travis/pecl/Makefile
index 26d6b39c897f4408608919f8120ccb1d148e6f21..d917b783e09daf6cf4adf6ac9dcd02e2e27dd83a 100644
(file)
--- a/
travis/pecl/Makefile
+++ b/
travis/pecl/Makefile
@@
-15,7
+15,7
@@
enable_all ?= no
with_config_file_scan_dir ?= $(prefix)/etc/php.d
with_php_config ?= $(bindir)/php-config
with_config_file_scan_dir ?= $(prefix)/etc/php.d
with_php_config ?= $(bindir)/php-config
-extdir = $(shell
$(with_php_config) --extension-dir 2>/dev/null
)
+extdir = $(shell
test -x $(with_php_config) && $(with_php_config) --extension-dir
)
PECL_MIRROR ?= http://pecl.php.net/get/
PECL_EXTENSION ?= $(shell cut -d: -f1 <<<"$(PECL)")
PECL_MIRROR ?= http://pecl.php.net/get/
PECL_EXTENSION ?= $(shell cut -d: -f1 <<<"$(PECL)")
@@
-23,7
+23,7
@@
PECL_SONAME ?= $(if $(shell cut -d: -f2 <<<"$(PECL)"),$(shell cut -d: -f2 <<<"$(
PECL_VERSION ?= $(shell cut -d: -f3 -s <<<"$(PECL)")
PECL_INI = $(with_config_file_scan_dir)/pecl.ini
PECL_VERSION ?= $(shell cut -d: -f3 -s <<<"$(PECL)")
PECL_INI = $(with_config_file_scan_dir)/pecl.ini
-PHP_VERSION ?= $(shell
php $(srcdir)/php-version.php $(PHP) < $(srcdir)/php-versions.json 2>/dev/null
)
+PHP_VERSION ?= $(shell
test -e $(srcdir)/php-versions.json && cat $(srcdir)/php-versions.json | php $(srcdir)/php-version.php $(PHP)
)
.PHONY: all php check clean reconf pecl ext test
.SUFFIXES:
.PHONY: all php check clean reconf pecl ext test
.SUFFIXES: