diff options
| author | Paul Smith <psmith@gnu.org> | 2016-04-04 01:15:17 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2016-04-04 01:38:37 -0400 |
| commit | 75dd0bd8bc045493550841d540992049458b81c3 (patch) | |
| tree | 62cffd83be9bc7949c0255a81c182e623da67eb8 /maintMakefile | |
| parent | 8b54c5cff98cd4b4533f4b4f10e82faca36c6880 (diff) | |
| download | make-git-75dd0bd8bc045493550841d540992049458b81c3.tar.gz | |
* maintMakefile: Fix logging of check-alt-config target.
Diffstat (limited to 'maintMakefile')
| -rw-r--r-- | maintMakefile | 10 |
1 files 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. # |