summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/config.m49
-rw-r--r--sapi/cli/php.1.in4
2 files changed, 6 insertions, 7 deletions
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index aa2c8321d..123df11d7 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18 2003/12/01 15:17:10 sniper Exp $
+dnl $Id: config.m4,v 1.18.2.2 2005/06/20 11:48:25 sniper Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -22,15 +22,14 @@ if test "$PHP_SAPI_CLI" != "no"; then
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
- *cygwin*)
- SAPI_CLI_PATH=sapi/cli/php.exe
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ *netware*)
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
;;
*)
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
+ INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
PHP_SUBST(BUILD_CLI)
PHP_SUBST(INSTALL_CLI)
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 0171af057..c6380e296 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -14,7 +14,7 @@
./" | Author: Marcus Boerger <helly@php.net> |
./" +----------------------------------------------------------------------+
./"
-./" $Id: php.1.in,v 1.7 2004/05/02 09:14:02 helly Exp $
+./" $Id: php.1.in,v 1.7.2.1 2005/04/30 04:12:43 sniper Exp $
./"
.TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
.SH NAME
@@ -348,7 +348,7 @@ For a more or less complete description of PHP look here:
.B http://www.php.net/manual/
.PD 1
.P
-A nice introduction to PHP by Stig Sæther Bakken can be found here:
+A nice introduction to PHP by Stig Bakken can be found here:
.PD 0
.P
.B http://www.zend.com/zend/art/intro.php