[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1857-g2a2500c

[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=2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f

The branch, master has been updated
       via  2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f (commit)
       via  4ced60d7fc474f008d642e280f7205f75f7c04d9 (commit)
       via  06684c510ab3115093178cdcfb28c2fff41b324c (commit)
       via  f874f9eeb7d996a7fc56c11342e9a094a87a402a (commit)
      from  4933232e195fa4650400990bfba4c88fae9b8a29 (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 2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f
Merge: 4933232 4ced60d
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 14 14:07:12 2012 +0100

    Merge branch 'maint'
    
    * maint:
      fixup: do not tickle makefile-deps.test with the make_dryrun code
      gitattributes: custom merge driver for ChangeLog not needed anymore
      gitattributes: use "union" merge driver for NEWS

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

Summary of changes:
 .gitattributes        |    2 +-
 lib/am/header-vars.am |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b6c3614..5126add 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-ChangeLog merge=merge-changelog
+NEWS merge=union
 *.texi* diff=texinfo
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 1078a3d..97516ef 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -32,12 +32,15 @@ VPATH = @srcdir@
 ## and are thus executed also with "make -n" -- either because they
 ## are declared as dependencies to '.MAKE' (NetBSD make), or because
 ## their recipes contain the "$(MAKE)" string (GNU and Solari make).
+
+## The case statement has [:] in order to not tickle makefile-deps.test
+## which greps for '^ *:'.
 am__make_dryrun = \
   { \
     am__dry=no; \
     for am__flg in : $(MAKEFLAGS); do \
       case $$am__flg in \
-        :) ;; \
+        [:]) ;; \
         *=*|--*) ;; \
         *n*) am__dry=yes; break;; \
       esac; \


hooks/post-receive
-- 
GNU Automake