Skip to content

Commit 378e5e4

Browse files
committed
Merge branch 'jn/less-reconfigure' into maint
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
2 parents 37a1130 + 1226504 commit 378e5e4

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,8 +2275,14 @@ configure: configure.ac GIT-VERSION-FILE
22752275
$(RM) $<+
22762276

22772277
ifdef AUTOCONFIGURED
2278-
config.status: configure
2279-
$(QUIET_GEN)if test -f config.status; then \
2278+
# We avoid depending on 'configure' here, because it gets rebuilt
2279+
# every time GIT-VERSION-FILE is modified, only to update the embedded
2280+
# version number string, which config.status does not care about. We
2281+
# do want to recheck when the platform/environment detection logic
2282+
# changes, hence this depends on configure.ac.
2283+
config.status: configure.ac
2284+
$(QUIET_GEN)$(MAKE) configure && \
2285+
if test -f config.status; then \
22802286
./config.status --recheck; \
22812287
else \
22822288
./configure; \

0 commit comments

Comments
 (0)