summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am22
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index b6a5bbde1..030c2eb6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -620,7 +620,7 @@ dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
# configure in 't/wrap'.
$(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
- $(AM_V_GEN): \
+ $(AM_V_GEN)tmp=amhello-output.tmp \
&& PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
&& export PATH \
&& $(am__cd) $(srcdir)/doc/amhello \
@@ -631,11 +631,21 @@ $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
&& AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
&& AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
&& AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
- && $(am_AUTORECONF) -vfi \
- && ./configure \
- && $(MAKE) $(AM_MAKEFLAGS) distcheck \
- && $(MAKE) $(AM_MAKEFLAGS) distclean \
- && rm -rf $(amhello_configury) \
+ && ( \
+ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
+ && $(am_AUTORECONF) -vfi \
+ && ./configure \
+ && $(MAKE) $(AM_MAKEFLAGS) distcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ || { \
+ if $(AM_V_P); then :; else \
+ echo "$@: recipe failed." >&5; \
+ echo "See file '`pwd`/$$tmp' for details" >&5; \
+ fi; \
+ exit 1; \
+ } \
+ ) \
+ && rm -rf $(amhello_configury) $$tmp \
&& mv -f amhello-1.0.tar.gz ..