From: Jani Taskinen <jani@php.net>
Date: Mon, 20 Jul 2009 10:51:40 +0000 (+0000)
Subject: - Removed unused parts
X-Git-Tag: php-5.2.11RC1~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12a666b7e036be11dd1889990c8be1f77198e4c8;p=php

- Removed unused parts
---

diff --git a/build/build.mk b/build/build.mk
index 3e1dad6c5f..a4e8c6d6e6 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -20,9 +20,7 @@
 # Makefile to generate build tools
 #
 
-ZENDDIR = Zend
-
-SUBDIRS = $(ZENDDIR) TSRM
+SUBDIRS = Zend TSRM
 
 STAMP = buildmk.stamp
 
@@ -33,11 +31,10 @@ all: $(STAMP) $(ALWAYS)
 	@$(MAKE) -s -f build/build2.mk
 
 generated_lists:
-	@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
-		TSRM/Makefile.am > $@
-	@echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
-	@echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
-		$(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+	@echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
+	@echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+	@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+		Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
 	@build/buildcheck.sh $(STAMP)
diff --git a/buildconf b/buildconf
index 9d4621f923..f1f2f778b8 100755
--- a/buildconf
+++ b/buildconf
@@ -36,7 +36,7 @@ fi
 rm -f generated_lists
 
 if test "$debug" = "yes"; then
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
+  ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=""
 else
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
+  ${MAKE:-make} -s -f build/build.mk
 fi