* maintMakefile (checkcfg.%): Add testing of build.sh

diff --git a/.gitignore b/.gitignore
index 24db93070b8aebc376e4488b56bd0ff25418da0e..6e3f5a284ea771f668f5ed2aca5280e1dbb9fd29 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ config.h.W32
 configh.dos
 make-[0-9]*/
 make-[0-9]*.tar.*
+checkcfg.*.log

diff --git a/maintMakefile b/maintMakefile
index f8bb678a27dd0d49f254943ca330a0f6e18708b8..cacab4c922c2929b6737cee691fd9704288c5647 100644 (file)
--- 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
 
 
 ## --------------- ##