summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-09 08:25:59 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-09 08:25:59 -0800
commit85f269704890e71933ea90cd8e6b4ef23f51d620 (patch)
treeab207d2a6353c67b6b7a4e11d64c69a397814d1e
parent48b7f524550ad46db95ec097e7f085160073a247 (diff)
parent122650457a619a6572c358ba9605a798ac771274 (diff)
downloadgit-85f269704890e71933ea90cd8e6b4ef23f51d620.tar.gz
Merge branch 'jn/less-reconfigure'
When autoconf is used, any build on a different commit always ran "config.status --recheck" even when unnecessary. * jn/less-reconfigure: build: do not automatically reconfigure unless configure.ac changed
-rw-r--r--Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 56424b48b0..cd0664accb 100644
--- a/Makefile
+++ b/Makefile
@@ -2313,8 +2313,14 @@ configure: configure.ac GIT-VERSION-FILE
$(RM) $<+
ifdef AUTOCONFIGURED
-config.status: configure
- $(QUIET_GEN)if test -f config.status; then \
+# We avoid depending on 'configure' here, because it gets rebuilt
+# every time GIT-VERSION-FILE is modified, only to update the embedded
+# version number string, which config.status does not care about. We
+# do want to recheck when the platform/environment detection logic
+# changes, hence this depends on configure.ac.
+config.status: configure.ac
+ $(QUIET_GEN)$(MAKE) configure && \
+ if test -f config.status; then \
./config.status --recheck; \
else \
./configure; \