cvs: php4 / buildconf /build build.mk
| From: | James Cox | Date: | Sun, 23 Jun 2002 15:47:40 +0000 |
| Subject: | cvs: php4 / buildconf /build build.mk | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12461@lists.php.net to get a copy of this message | ||
imajes Sun Jun 23 11:47:40 2002 EDT
Modified files:
/php4 buildconf
/php4/build build.mk
Log:
changing this to mv ZendEngine2 Zend instead of shell logic that isn't portable.
Index: php4/buildconf
diff -u php4/buildconf:1.50 php4/buildconf:1.51
--- php4/buildconf:1.50 Tue Sep 26 07:19:38 2000
+++ php4/buildconf Sun Jun 23 11:47:39 2002
@@ -1,10 +1,14 @@
#!/bin/sh
-# $Id: buildconf,v 1.50 2000/09/26 11:19:38 sas Exp $
+# $Id: buildconf,v 1.51 2002/06/23 15:47:39 imajes Exp $
supplied_flag=$1
if test "$supplied_flag" = "--copy"; then
automake_flags=--copy
+fi
+
+if test -d "ZendEngine2"; then
+ mv ZendEngine2 Zend
fi
## build.mk does not check aclocal exit status yet
Index: php4/build/build.mk
diff -u php4/build/build.mk:1.14 php4/build/build.mk:1.15
--- php4/build/build.mk:1.14 Thu Jun 20 04:42:08 2002
+++ php4/build/build.mk Sun Jun 23 11:47:40 2002
@@ -14,13 +14,13 @@
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: build.mk,v 1.14 2002/06/20 08:42:08 imajes Exp $
+# $Id: build.mk,v 1.15 2002/06/23 15:47:40 imajes Exp $
#
#
# Makefile to generate build tools
#
-ZENDDIR = $(shell if test -d "ZendEngine2"; then echo ZendEngine2; else echo Zend; fi)
+ZENDDIR = Zend
SUBDIRS = $(ZENDDIR) TSRM