summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cox <imajes@php.net>2002-06-23 15:47:40 +0000
committerJames Cox <imajes@php.net>2002-06-23 15:47:40 +0000
commitbca90b07961590cb7ae2aea793c1b378b930aef2 (patch)
tree9d3abaf2606948a62ef5f8b624e656b8bcc82078
parent9c148f0d842b564bd1b54a32bd582fad8ddc6be8 (diff)
downloadphp-git-bca90b07961590cb7ae2aea793c1b378b930aef2.tar.gz
changing this to mv ZendEngine2 Zend instead of shell logic that isn't portable.
-rw-r--r--build/build.mk2
-rwxr-xr-xbuildconf4
2 files changed, 5 insertions, 1 deletions
diff --git a/build/build.mk b/build/build.mk
index 1d285bf200..eb71d959af 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -20,7 +20,7 @@
# Makefile to generate build tools
#
-ZENDDIR = $(shell if test -d "ZendEngine2"; then echo ZendEngine2; else echo Zend; fi)
+ZENDDIR = Zend
SUBDIRS = $(ZENDDIR) TSRM
diff --git a/buildconf b/buildconf
index c3530e8614..957f3916b2 100755
--- a/buildconf
+++ b/buildconf
@@ -7,6 +7,10 @@ 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
##
#mv aclocal.m4 aclocal.m4.old 2>/dev/null