From 75dd0bd8bc045493550841d540992049458b81c3 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Mon, 4 Apr 2016 01:15:17 -0400 Subject: [PATCH] * maintMakefile: Fix logging of check-alt-config target. --- maintMakefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/maintMakefile b/maintMakefile index f7bdf002..0720669a 100644 --- a/maintMakefile +++ b/maintMakefile @@ -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. #