From ee840f1ff64735015bd751d1cc3ce9fd1015fc57 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Thu, 4 Dec 2003 15:59:04 +0000
Subject: [PATCH] MFH: Only add 'install-modules' into install targets when
 there are such      modules to install

---
 Makefile.global | 8 ++++----
 acinclude.m4    | 1 +
 configure.in    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.global b/Makefile.global
index e2c591ad41..5f33f58b11 100644
--- 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 cbc580f22f..d80928a348 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1159,6 +1159,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 18990c2ba4..66b5f1005d 100644
--- a/configure.in
+++ b/configure.in
@@ -1138,7 +1138,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)
-- 
2.50.1