- Only add 'install-modules' into install targets when there are such

  modules to install.

diff --git a/Makefile.global b/Makefile.global
index 0492759aefcc7612841cad89d5c0d3ddb9715166..e30bc42f788228bad3d1008aa14afb5f07e652ce 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -38,10 +38,10 @@ install-sapi: $(OVERALL_TARGET)
 
 install-modules: build-modules
        @test -d modules && \
-       $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
-       echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
-       rm -f modules/*.la && \
-       $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+       $(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-tester:
        @echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"

diff --git a/acinclude.m4 b/acinclude.m4
index d8a9ce9a3cbfd3dbc0f769f28d357543c9088877..29bd492f609e6d567b816d86e6f27f6809f3caff 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1153,6 +1153,7 @@ dnl Basically sets up the link-stage for building module-name
 dnl from object_var in build-dir.
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
+  install_modules="install-modules"
   PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
   PHP_SUBST($2)
   cat >>Makefile.objects<<EOF

diff --git a/configure.in b/configure.in
index 72f7a0db72b6ef4176958b884f4b5e539535965e..40fd38509820b93e437f1be691f0dd4ee10372ba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1149,7 +1149,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-modules $install_pear install-build install-headers install-programs"
+install_targets="$install_modules $install_pear install-build install-headers install-programs"
 
 case $PHP_SAPI in
   cgi)