X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile;h=3a34ec3a1ba08b0f069628445363f94469e2e8c4;hb=dd0a2e61211836ac7b24a271a5bd68af99dee3d6;hp=01d77923ca3e21e575e305239b1446441fdf945b;hpb=2622a78d9eb346103f502445f6ac8d315ebfecc5;p=m6w6%2Fpecl-ci

diff --git a/Makefile b/Makefile
index 01d7792..3a34ec3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ TMPDIR ?= /tmp
 makdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
 
 ifdef TRAVIS
-prefix ?= $(HOME)/build/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
+prefix ?= $(HOME)/cache/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
 else
 prefix ?= $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
 endif
@@ -75,10 +75,11 @@ clean:
 .PHONY: check
 check: $(PHP_RELEASES)
 	@if test -z "$(PHP)"; then echo "No php version specified, e.g. PHP=5.6"; exit 1; fi
+	if test -d $(srcdir)/php-$(PHP_VERSION)/.git; then cd $(srcdir)/php-$(PHP_VERSION)/; git pull; fi
 
 .PHONY: reconf
 reconf: check $(srcdir)/php-$(PHP_VERSION)/configure
-	cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix)
+	cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) && rm -f sapi/cli/php
 
 .PHONY: php
 php: check $(bindir)/php | $(PECL_INI)
@@ -89,7 +90,6 @@ php: check $(bindir)/php | $(PECL_INI)
 		fi \
 	done
 
-.PHONY: $(srcdir)/php-master/configure
 $(srcdir)/php-$(PHP_VERSION)/configure: | $(PHP_RELEASES)
 	cd $(srcdir) && awk -F "\t" '/^$(PHP)\t/{exit system($$3)}' <$|
 
@@ -100,7 +100,7 @@ $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php: $(srcdir)/php-$(PHP_VERSION)/Makefile
 	cd $(srcdir)/php-$(PHP_VERSION) && make -j $(JOBS) || make
 
 $(bindir)/php: $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php | $(PHP_RELEASES)
-	cd $(srcdir)/php-$(PHP_VERSION) && make install INSTALL=install
+	cd $(srcdir)/php-$(PHP_VERSION) && make -j $(JOBS) install INSTALL=install
 
 $(srcdir) $(extdir) $(with_config_file_scan_dir):
 	mkdir -p $@
@@ -110,6 +110,7 @@ $(srcdir) $(extdir) $(with_config_file_scan_dir):
 .PHONY: pecl-check
 pecl-check:
 	@if test -z "$(PECL)"; then echo "No pecl extension specified, e.g. PECL=pecl_http:http"; exit 1; fi
+	if test -d $(PECL_DIR)/.git; then cd $(PECL_DIR)/; git pull; fi
 
 .PHONY: pecl-clean
 pecl-clean:
@@ -122,7 +123,6 @@ pecl-rm:
 $(PECL_INI): | $(with_config_file_scan_dir)
 	touch $@
 
-.PHONY: $(srcdir)/pecl-$(PECL_EXTENSION)-master/config.m4
 $(PECL_DIR)/config.m4:
 	if test "$(PECL_VERSION)" = "master"; then \
 		if test -d $(PECL_DIR); then \
@@ -148,7 +148,7 @@ $(PECL_DIR)/.libs/$(PECL_SONAME).so: $(PECL_DIR)/Makefile
 	cd $(PECL_DIR) && make -j $(JOBS) || make
 
 $(extdir)/$(PECL_SONAME).so: $(PECL_DIR)/.libs/$(PECL_SONAME).so $(extdir)
-	cd $(PECL_DIR) && make install
+	cd $(PECL_DIR) && make -j $(JOBS) install INSTALL=install
 
 .PHONY: pecl
 pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)