From: Michael Wallner Date: Tue, 6 Sep 2016 14:18:25 +0000 (+0200) Subject: 5.3 compat X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5e781dcbd19aac1bc3a31b3187fd42011e70dd3d;p=m6w6%2Fpecl-ci 5.3 compat --- diff --git a/Makefile b/Makefile index 7e0f3bf..3701db3 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ check: $(PHP_VERSIONS_JSON) .PHONY: reconf reconf: check $(srcdir)/php-$(PHP_VERSION)/configure - cd $(srcdir)/php-$(PHP_VERSION) && ./configure -C --prefix=$(prefix) + cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) .PHONY: php php: check $(bindir)/php | $(PECL_INI) @@ -78,7 +78,7 @@ $(srcdir)/php-$(PHP_VERSION)/configure: | $(PHP_VERSIONS_JSON) fi $(srcdir)/php-$(PHP_VERSION)/Makefile: $(srcdir)/php-$(PHP_VERSION)/configure | $(PHP_VERSIONS_JSON) - cd $(srcdir)/php-$(PHP_VERSION) && ./configure -C --prefix=$(prefix) + cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php: $(srcdir)/php-$(PHP_VERSION)/Makefile | $(PHP_VERSIONS_JSON) cd $(srcdir)/php-$(PHP_VERSION) && make -j $(JOBS) || make @@ -89,6 +89,9 @@ $(bindir)/php: $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php | $(PHP_VERSIONS_JSON) $(with_config_file_scan_dir): mkdir -p $@ +$(extdir): + mkdir -p $@ + ## -- PECL .PHONY: pecl-check @@ -114,12 +117,12 @@ $(PECL_DIR)/configure: $(PECL_DIR)/config.m4 cd $(PECL_DIR) && $(bindir)/phpize $(PECL_DIR)/Makefile: $(PECL_DIR)/configure - cd $(PECL_DIR) && ./configure -C + cd $(PECL_DIR) && ./configure --cache-file=config.cache $(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)/$(PECL_SONAME).so: $(PECL_DIR)/.libs/$(PECL_SONAME).so $(extdir) cd $(PECL_DIR) && make install .PHONY: pecl