undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/less-reconfigure' into maint

Browse Source 
* jn/less-reconfigure:
  Makefile: avoid infinite loop on configure.ac change
This commit is contained in:
Junio C Hamano 2013-02-27 09:59:19 -08:00
commit c054ef9be2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -2272,12 +2272,14 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh
mv $@+ $@ mv $@+ $@
endif # NO_PYTHON endif # NO_PYTHON
CONFIGURE_RECIPE = $(RM) configure configure.ac+ && \
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
configure.ac >configure.ac+ && \
autoconf -o configure configure.ac+ && \
$(RM) configure.ac+
configure: configure.ac GIT-VERSION-FILE configure: configure.ac GIT-VERSION-FILE
$(QUIET_GEN)$(RM) $@ $<+ && \ $(QUIET_GEN)$(CONFIGURE_RECIPE)
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$< > $<+ && \
autoconf -o $@ $<+ && \
$(RM) $<+
ifdef AUTOCONFIGURED ifdef AUTOCONFIGURED
# We avoid depending on 'configure' here, because it gets rebuilt # We avoid depending on 'configure' here, because it gets rebuilt
@ -2286,7 +2288,7 @@ ifdef AUTOCONFIGURED
# do want to recheck when the platform/environment detection logic # do want to recheck when the platform/environment detection logic
# changes, hence this depends on configure.ac. # changes, hence this depends on configure.ac.
config.status: configure.ac config.status: configure.ac
$(QUIET_GEN)$(MAKE) configure && \ $(QUIET_GEN)$(CONFIGURE_RECIPE) && \
if test -f config.status; then \ if test -f config.status; then \
./config.status --recheck; \ ./config.status --recheck; \
else \ else \