From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 30 Jul 2012 09:31:28 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e72e0851cc26c5cf322ff991f843f03b6e3fb0c;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  build: fix build in VPATH setup
  news: fix a couple of minor formatting issues
  gen-tests: simplify sourcing of helper shell files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

0e72e0851cc26c5cf322ff991f843f03b6e3fb0c
diff --cc Makefile.am
index 3ea096eec,6ff7e71cf..2cca5d5f6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -422,7 -414,9 +422,8 @@@ EXTRA_DIST += t/ax/distcheck-hook-m4.a
  
  t/ax/test-defs.sh: t/ax/test-defs.in Makefile
  	$(AM_V_at)rm -f $@ $@-t
 -	$(AM_V_at)$(MKDIR_P) t/ax
 -	$(AM_V_GEN)in=t/ax/test-defs.in \
 -	  && $(do_subst) <$(srcdir)/$$in >$@-t
++	$(AM_V_at)$(MKDIR_P) $(@D)
 +	$(AM_V_GEN)$(do_subst)
  	$(generated_file_finalize)
  EXTRA_DIST += t/ax/test-defs.in
  CLEANFILES += t/ax/test-defs.sh