[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.1-22-gc8ec152

[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=c8ec1527547db12de96d7e67e2980e29ebb4ba57

The branch, maint has been updated
       via  c8ec1527547db12de96d7e67e2980e29ebb4ba57 (commit)
       via  511b6896793aa4b6b76e9c220c7c7cab58ed7ae7 (commit)
      from  c45604a7135b5301f8777b006f668f996aaac1a2 (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 c8ec1527547db12de96d7e67e2980e29ebb4ba57
Merge: c45604a 511b689
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jun 11 21:27:12 2012 +0200

    Merge branch 'subdir-objects-pr10697' into maint
    
    * subdir-objects-pr10697:
      maintcheck: fix failures, both real and spurious

commit 511b6896793aa4b6b76e9c220c7c7cab58ed7ae7
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jun 11 21:21:32 2012 +0200

    maintcheck: fix failures, both real and spurious
    
    * syntax-checks.mk (sc_rm_minus_f): Whitelist the
    't/subobj-clean*-pr10697.sh' tests.
    * t/subobj-clean-pr10697.sh: When redefining PATH,
    use '$PATH_SEPARATOR', not hard-coded ':'.
    * t/subobj-clean-lt-pr10697.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 syntax-checks.mk             |    2 +-
 t/subobj-clean-lt-pr10697.sh |    2 +-
 t/subobj-clean-pr10697.sh    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4b226a0..c09156e 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -169,7 +169,7 @@ sc_no_brace_variable_expansions:
 ## Make sure 'rm' is called with '-f'.
 sc_rm_minus_f:
        @if grep -v '^#' $(ams) $(xtests) \
-          | grep -v '/spy-rm\.tap:' \
+          | grep -vE '/(spy-rm\.tap|subobj-clean.*-pr10697\.sh):' \
           | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
        then \
          echo "Suspicious 'rm' invocation." 1>&2; \
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index 0d8e4d0..cfebc99 100755
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -112,7 +112,7 @@ OBJEXT=lo
 $MAKE
 
 # This must go after configure, since that will invoke rm many times.
-PATH=$ocwd/rm-wrap:$PATH; export PATH
+PATH=$ocwd/rm-wrap$PATH_SEPARATOR$PATH; export PATH
 $MAKE sanity-check-rm || fatal_ "rm wrapper doesn't work as expected"
 
 $MAKE mostlyclean
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index 7ed07d6..69abc10 100755
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -108,7 +108,7 @@ test -f get-objext.sh
 $MAKE
 
 # This must go after configure, since that will invoke rm many times.
-PATH=$ocwd/rm-wrap:$PATH; export PATH
+PATH=$ocwd/rm-wrap$PATH_SEPARATOR$PATH; export PATH
 $MAKE sanity-check-rm || fatal_ "rm wrapper doesn't work as expected"
 
 $MAKE mostlyclean


hooks/post-receive
-- 
GNU Automake