Currently, CGI binary is built as "php" under source
root and copied as "php-cgi" when it is installed.
I would like to move CGI binary build location from
source root to sapi/cgi and change binary name from
php to php-cgi to avoid possible confusion.
Attached patch is supposed to do the job.
Does anyone find problem in this patch?
--
Yasuo Ohgaki
Index: Makefile.global
===================================================================
RCS file: /repository/php4/Makefile.global,v
retrieving revision 1.24
diff -u -r1.24 Makefile.global
--- Makefile.global 16 Aug 2002 00:36:05 -0000 1.24
+++ Makefile.global 28 Sep 2002 11:37:00 -0000
@@ -16,7 +16,7 @@
libs/libphp4.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/libphp4.so
-php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+sapi/cgi/php-cgi: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_CGI)
sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
@@ -64,7 +64,7 @@
clean:
find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a| xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
- rm -f libphp4.la php sapi/cli/php modules/* libs/*
+ rm -f libphp4.la sapi/cgi/php-cgi sapi/cli/php modules/* libs/*
distclean: clean
rm -f config.cache config.log config.status Makefile.objects
Makefile.fragments libtool main/php_config.h stamp-h php4.spec
sapi/apache/libphp4.module buildmk.stamp
Index: acinclude.m4
===================================================================
RCS file: /repository/php4/acinclude.m4,v
retrieving revision 1.205
diff -u -r1.205 acinclude.m4
--- acinclude.m4 6 Sep 2002 10:27:26 -0000 1.205
+++ acinclude.m4 28 Sep 2002 11:37:01 -0000
@@ -814,7 +814,7 @@
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN(PHP_BUILD_PROGRAM,[
- OVERALL_TARGET=php
+ OVERALL_TARGET=sapi/cgi/php-cgi
php_c_pre='$(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=' && echo > $[@]'
Index: configure.in
===================================================================
RCS file: /repository/php4/configure.in,v
retrieving revision 1.372
diff -u -r1.372 configure.in
--- configure.in 6 Sep 2002 17:18:16 -0000 1.372
+++ configure.in 28 Sep 2002 11:37:03 -0000
@@ -215,7 +215,7 @@
dnl -------------------------------------------------------------------------
dnl paths to the targets are relative to the build directory
-SAPI_PROGRAM=php
+SAPI_PROGRAM=sapi/cgi/php-cgi
SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
SAPI_STATIC=libs/libphp4.a
SAPI_LIBTOOL=libphp4.la
Index: sapi/cgi/config.m4
===================================================================
RCS file: /repository/php4/sapi/cgi/config.m4,v
retrieving revision 1.18
diff -u -r1.18 config.m4
--- sapi/cgi/config.m4 4 Sep 2002 18:47:26 -0000 1.18
+++ sapi/cgi/config.m4 28 Sep 2002 11:37:07 -0000
@@ -100,10 +100,10 @@
case $host_alias in
*darwin*)
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS)
\$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o)
\$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS)
+\$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o)
+\$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cgi/php-cgi"
;;
*)
- 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 php"
+ 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/php-cgi"
;;
esac
PHP_SUBST(BUILD_CGI)
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
