From fa453d5abd358a1e99e304ba69e7a11059e8f1a0 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 30 Jan 2015 17:58:49 +0100
Subject: [PATCH] make buildconf actually work

---
 build/build.mk  | 9 ++++-----
 build/build2.mk | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build.mk b/build/build.mk
index 007f081f19dd7..6e2668287ece9 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -22,17 +22,16 @@ SUBDIRS = Zend TSRM
 
 STAMP = buildmk.stamp
 
-ALWAYS = generated_lists
-
-
-all: $(STAMP) $(ALWAYS)
+all: $(STAMP) generated_lists
 	@$(MAKE) -s -f build/build2.mk
 
-generated_lists:
+generated_lists: ALWAYS
 	@echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
 	@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
 		Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
+ALWAYS:
+
 $(STAMP): build/buildcheck.sh
 	@build/buildcheck.sh $(STAMP)
 
diff --git a/build/build2.mk b/build/build2.mk
index 2d9e684ec0a7b..08f144f8b609a 100644
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -50,5 +50,6 @@ aclocal.m4: configure.in acinclude.m4
 
 configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
+	@rm -f $@
 	$(PHP_AUTOCONF) $(SUPPRESS_WARNINGS)