summaryrefslogtreecommitdiff
path: root/maintMakefile
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2013-10-19 12:25:09 -0400
committerPaul Smith <psmith@gnu.org>2013-10-19 12:25:09 -0400
commitd0a623c3f40a7a76e2342b0bb5a24041bec1d2a1 (patch)
tree879bf3f891ff08527a4901f5a2f75f1f7e898974 /maintMakefile
parent3e4aad4a97562431d91b8bf694f1265d182e2273 (diff)
downloadmake-d0a623c3f40a7a76e2342b0bb5a24041bec1d2a1.tar.gz
* maintMakefile (checkcfg.%): Add testing of build.sh
Diffstat (limited to 'maintMakefile')
-rw-r--r--maintMakefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/maintMakefile b/maintMakefile
index f8bb678a..cacab4c9 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -230,16 +230,22 @@ check-alt-config: \
checkcfg.CPPFLAGS^-DNO_OUTPUT_SYNC \
checkcfg.CPPFLAGS^-DNO_ARCHIVES
+NR_MAKE = $(MAKE)
+
+# Check builds both with build.sh and with make
checkcfg.%: distdir
- @ rm -rf $(distdir)/_build \
+ @( rm -rf $(distdir)/_build \
&& mkdir $(distdir)/_build \
&& cd $(distdir)/_build \
&& echo "Testing configure with $(subst ^,=,$*)" \
&& ../configure --srcdir=.. $(subst ^,=,$*) \
$(AM_DISTCHECK_CONFIGURE_FLAGS) $(DISTCHECK_CONFIGURE_FLAGS) \
CFLAGS='$(AM_CFLAGS)' \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) check
+ && ./build.sh \
+ && ./make $(AM_MAKEFLAGS) check \
+ && rm -f *.o make \
+ && $(NR_MAKE) $(AM_MAKEFLAGS) \
+ && ./make $(AM_MAKEFLAGS) check ) 2>&1 | tee checkcfg.$*.log
## --------------- ##