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>

diff --cc Makefile.am
index 3ea096eec2674b664cf05937217849142f01a052,6ff7e71cf6c92caf37d70211dd6e99217c9da0d0..2cca5d5f63b2e9c285635df041c89f5a87b1771c
--- 1/Makefile.am
--- 2/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

diff --cc gen-testsuite-part
Simple merge