From: James Cox <imajes@php.net>
Date: Sun, 23 Jun 2002 15:47:40 +0000 (+0000)
Subject: changing this to mv ZendEngine2 Zend instead of shell logic that isn't portable.
X-Git-Tag: php-4.3.0dev_zend2_alpha2~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bca90b07961590cb7ae2aea793c1b378b930aef2;p=php

changing this to mv ZendEngine2 Zend instead of shell logic that isn't portable.
---

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