From e13e315a10cff71e83b71d50d2092fa50f10b3c7 Mon Sep 17 00:00:00 2001 From: foobar Date: Thu, 4 Dec 2003 15:57:55 +0000 Subject: [PATCH] - 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 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<