sniper Thu Dec 4 10:59:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src Makefile.global acinclude.m4 configure.in
Log:
MFH: 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.40.2.13 php-src/Makefile.global:1.40.2.14
--- php-src/Makefile.global:1.40.2.13 Thu Jul 24 13:45:15 2003
+++ php-src/Makefile.global Thu Dec 4 10:59:04 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.218.2.32 php-src/acinclude.m4:1.218.2.33
--- php-src/acinclude.m4:1.218.2.32 Thu Nov 13 09:18:02 2003
+++ php-src/acinclude.m4 Thu Dec 4 10:59:04 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.32 2003/11/13 14:18:02 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.33 2003/12/04 15:59:04 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1159,6 +1159,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.396.2.90 php-src/configure.in:1.396.2.91
--- php-src/configure.in:1.396.2.90 Thu Dec 4 08:42:25 2003
+++ php-src/configure.in Thu Dec 4 10:59:04 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.90 2003/12/04 13:42:25 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.91 2003/12/04 15:59:04 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1138,7 +1138,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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
