cvs: php-src / Makefile.global acinclude.m4 configure.in

sniper Thu Dec 4 10:57:56 2003 EDT Modified files: /php-src Makefile.global acinclude.m4 configure.in Log: - Only add 'install-modules' into install targets when there are such modules to install. Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.50 php-src/Makefile.global:1.51 --- php-src/Makefile.global:1.50 Thu Jul 24 13:44:16 2003 +++ php-src/Makefile.global Thu Dec 4 10:57:55 2003 @@ -38,10 +38,10 @@ 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)/" Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.265 php-src/acinclude.m4:1.266 --- php-src/acinclude.m4:1.265 Thu Nov 13 09:17:47 2003 +++ php-src/acinclude.m4 Thu Dec 4 10:57:55 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.265 2003/11/13 14:17:47 sniper Exp $ +dnl $Id: acinclude.m4,v 1.266 2003/12/04 15:57:55 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1153,6 +1153,7 @@ 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 Index: php-src/configure.in diff -u php-src/configure.in:1.482 php-src/configure.in:1.483 --- php-src/configure.in:1.482 Thu Dec 4 08:41:48 2003 +++ php-src/configure.in Thu Dec 4 10:57:55 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.482 2003/12/04 13:41:48 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1149,7 +1149,7 @@ 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)