| 1 | diff -u -r ../php-7.1.0RC3/pear/Makefile.frag ./pear/Makefile.frag |
| 2 | --- ../php-7.1.0RC3/pear/Makefile.frag 2016-09-28 22:15:47.000000000 -0400 |
| 3 | +++ ./pear/Makefile.frag 2016-10-03 05:53:02.793555471 -0400 |
| 4 | @@ -12,7 +12,7 @@ |
| 5 | PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar |
| 6 | |
| 7 | install-pear-installer: $(SAPI_CLI_PATH) |
| 8 | - @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} |
| 9 | + php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} |
| 10 | |
| 11 | install-pear: |
| 12 | @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" |
| 13 | @@ -25,7 +25,7 @@ |
| 14 | elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ |
| 15 | "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ |
| 16 | else \ |
| 17 | - $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ |
| 18 | + php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ |
| 19 | fi \ |
| 20 | fi \ |
| 21 | fi |