guess sh doesn't like those redirects

[m6w6/ext-pq] / travis / pecl / Makefile

diff --git a/travis/pecl/Makefile b/travis/pecl/Makefile
index a338a5d42880992229dd32aaeac5b6e263c14307..358acca920a99027c409e71339a017f56a70ec05 100644 (file)
--- a/travis/pecl/Makefile
+++ b/travis/pecl/Makefile
@@ -15,15 +15,15 @@ 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_MIRROR ?= http://pecl.php.net/get/

-PECL_EXTENSION ?= $(shell cut -d: -f1 <<<"$(PECL)")
-PECL_SONAME ?= $(if $(shell cut -d: -f2 <<<"$(PECL)"),$(shell cut -d: -f2 <<<"$(PECL)"),$(PECL_EXTENSION))
-PECL_VERSION ?= $(shell cut -d: -f3 -s <<<"$(PECL)")
+PECL_EXTENSION ?= $(shell echo $(PECL) | cut -d: -f1)
+PECL_SONAME ?= $(if $(shell echo $(PECL) | cut -d: -f2),$(shell echo $(PECL) | cut -d: -f2),$(PECL_EXTENSION))
+PECL_VERSION ?= $(shell echo $(PECL) | cut -d: -f3 -s)

 PECL_INI = $(with_config_file_scan_dir)/pecl.ini
 
 PECL_INI = $(with_config_file_scan_dir)/pecl.ini
 

-PHP_VERSION ?= $(shell php $(srcdir)/php-version.php $(PHP) < php-versions.json)
+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: