* maintMakefile: Fix logging of check-alt-config target.

This commit is contained in:
Paul Smith 2016-04-04 01:15:17 -04:00
parent 8b54c5cff9
commit 75dd0bd8bc

View file

@ -230,11 +230,14 @@ check-alt-config: \
checkcfg.CPPFLAGS^-DNO_OUTPUT_SYNC \
checkcfg.CPPFLAGS^-DNO_ARCHIVES
# Trick GNU make so it doesn't run the submake as a recursive make.
NR_MAKE = $(MAKE)
# Check builds both with build.sh and with make
checkcfg.%: distdir
@( rm -rf $(distdir)/_build \
@echo "Building $@ (output in checkcfg.$*.log)"
@exec >'checkcfg.$*.log' 2>&1; \
rm -rf $(distdir)/_build \
&& mkdir $(distdir)/_build \
&& cd $(distdir)/_build \
&& echo "Testing configure with $(subst ^,=,$*)" \
@ -245,7 +248,7 @@ checkcfg.%: distdir
&& ./make $(AM_MAKEFLAGS) check \
&& rm -f *.o make \
&& $(NR_MAKE) $(AM_MAKEFLAGS) \
&& ./make $(AM_MAKEFLAGS) check ) 2>&1 | tee checkcfg.$*.log
&& ./make $(AM_MAKEFLAGS) check
## --------------- ##
@ -382,6 +385,9 @@ $(UPLOADS): $(DIST_ARCHIVES) $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE)
$(FTPPUT) "$(gnu-upload-host)" "$(gnu-upload-dir)/$(@:upload-%=%)" $^
# Rebuild Makefile.in if this file is modifed.
Makefile.in: maintMakefile
# Copyright (C) 1997-2016 Free Software Foundation, Inc.
# This file is part of GNU Make.
#