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 1d285bf200453d1c9d12f86cd031aaf4f93534c1..eb71d959af530b14836d695b2ee83e58bdc62f38 100644 (file)
--- 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 c3530e861467ee0888bfbb8fec710266529e20ea..957f3916b2955fe84e26a344b3a7b706023402ea 100755 (executable)
--- 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