[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.2-197-ge4fbe2a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e4fbe2ab6dee137d2f4735ca539613bb67411ebb

The branch, master has been updated
       via  e4fbe2ab6dee137d2f4735ca539613bb67411ebb (commit)
       via  a38534b1de0d0b582297cea30d163405f03924e3 (commit)
       via  7a498f9e8da31615aeb29cc860eb229738aeab2f (commit)
      from  63f8c3647b2e8015dc637791bb92981d4a00dab7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e4fbe2ab6dee137d2f4735ca539613bb67411ebb
Merge: 63f8c36 a38534b
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jul 30 11:09:27 2012 +0200

    Merge branch 'maint'
    
    * maint:
      build: fix build in VPATH setup
      gen-tests: simplify sourcing of helper shell files

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am        |    1 +
 gen-testsuite-part |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 98a67a0..6ff7e71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -414,6 +414,7 @@ EXTRA_DIST += t/ax/distcheck-hook-m4.am
 
 t/ax/test-defs.sh: t/ax/test-defs.in Makefile
        $(AM_V_at)rm -f $@ address@hidden
+       $(AM_V_at)$(MKDIR_P) t/ax
        $(AM_V_GEN)in=t/ax/test-defs.in \
          && $(do_subst) <$(srcdir)/$$in >address@hidden
        $(generated_file_finalize)
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 21c26c4..dee4cdd 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -361,7 +361,8 @@ foreach my $lt (TRUE, FALSE)
               required="@required"
               . ./defs || exit 1
               plan_ $planned
-              . "\$am_testauxdir/depcomp.sh"; exit \$?
+              . depcomp.sh
+              exit \$?
 EOF
           },
           0555);


hooks/post-receive
-- 
GNU Automake