From: foobar <sniper@php.net>
Date: Thu, 4 Dec 2003 15:57:55 +0000 (+0000)
Subject: - Only add 'install-modules' into install targets when there are such
X-Git-Tag: php-5.0.0b3RC1~326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e13e315a10cff71e83b71d50d2092fa50f10b3c7;p=php

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

diff --git a/Makefile.global b/Makefile.global
index 0492759aef..e30bc42f78 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 d8a9ce9a3c..29bd492f60 100644
--- 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 72f7a0db72..40fd385098 100644
--- 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)