diff --git a/Makefile.global b/Makefile.global index 6b49f3844fcc6..6369ad1f2992f 100644 --- a/Makefile.global +++ b/Makefile.global @@ -43,7 +43,6 @@ install-modules: build-modules @test -d modules && \ $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" - @rm -f modules/*.la >/dev/null 2>&1 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) install-headers: diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec351356c..9cbdb60a11728 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -3,7 +3,7 @@ peardir=$(PEAR_INSTALLDIR) # Skip all php.ini files altogether -PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 +PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 -d extension_dir="$(top_builddir)/modules" $(PHP_TEST_SHARED_EXTENSIONS) WGET = `which wget 2>/dev/null` FETCH = `which fetch 2>/dev/null` @@ -34,4 +34,3 @@ install-pear: else \ cat $(srcdir)/install-pear.txt; \ fi -