sas Tue Jul 1 21:08:27 2003 EDT
Modified files:
/php-src Makefile.global configure.in
/php-src/sapi/cgi Makefile.frag config9.m4
Log:
Fix install-sapi dependency - it should depend on OVERALL_TARGET, of course.
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.47 php-src/Makefile.global:1.48
--- php-src/Makefile.global:1.47 Sun Jun 29 01:59:29 2003
+++ php-src/Makefile.global Tue Jul 1 21:08:26 2003
@@ -16,15 +16,15 @@
libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir)
$(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la
$(phptempdir)/libphp5.la >/dev/null 2>&1
libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS)
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so
install: $(all_targets) $(install_targets)
-install-sapi: libphp5.la
+install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module"
- [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la
$(phptempdir)/libphp5.la >/dev/null 2>&1
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
[EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
Index: php-src/configure.in
diff -u php-src/configure.in:1.457 php-src/configure.in:1.458
--- php-src/configure.in:1.457 Tue Jul 1 13:01:21 2003
+++ php-src/configure.in Tue Jul 1 21:08:26 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.457 2003/07/01 17:01:21 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.458 2003/07/02 01:08:26 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1125,22 +1125,10 @@
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"
-
-case $PHP_SAPI in
- cgi)
- dnl Install CGI only (CLI is not installed even if it's enabled)
- install_targets="install-cgi $install_targets"
- ;;
- cli)
- dnl Install CLI only (--disable-cgi used, no other SAPIs enabled)
- install_targets="install-cli $install_targets"
- ;;
- *)
- dnl Install CLI and another SAPI
- install_targets="$PHP_INSTALL_CLI_TARGET install-sapi $install_targets"
- ;;
-esac
+install_targets="install-sapi install-modules $install_pear install-build
install-headers install-programs"
+if test "$PHP_SAPI" != "cgi"; then
+ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+fi
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
Index: php-src/sapi/cgi/Makefile.frag
diff -u php-src/sapi/cgi/Makefile.frag:1.2 php-src/sapi/cgi/Makefile.frag:1.3
--- php-src/sapi/cgi/Makefile.frag:1.2 Tue Jul 1 13:01:21 2003
+++ php-src/sapi/cgi/Makefile.frag Tue Jul 1 21:08:26 2003
@@ -1,6 +1,2 @@
$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_CGI)
-
-install-cgi: $(SAPI_CGI_PATH)
- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
- @$(INSTALL_CGI)
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.7 php-src/sapi/cgi/config9.m4:1.8
--- php-src/sapi/cgi/config9.m4:1.7 Tue Jul 1 13:01:21 2003
+++ php-src/sapi/cgi/config9.m4 Tue Jul 1 21:08:26 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.7 2003/07/01 17:01:21 sniper Exp $
+dnl $Id: config9.m4,v 1.8 2003/07/02 01:08:26 sas Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -147,6 +147,7 @@
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
+ INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
case $host_alias in
@@ -157,10 +158,8 @@
BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
- INSTALL_CGI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755
\$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
PHP_SUBST(BUILD_CGI)
- PHP_SUBST(INSTALL_CGI)
elif test "$PHP_SAPI_CLI" != "no"; then
AC_MSG_RESULT(no)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
