[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-495-g7d40532

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

The branch, maint has been updated
       via  7d40532a3464eee6a26d303c378c44af95075698 (commit)
       via  39a9fd16381469f911d42a3e27975edcb248bbf2 (commit)
       via  736fde9f6cf8d514ef30dc5d83fe2a41c3e22c9a (commit)
       via  0773a99888c8932c19b61145d78317278d2bdd66 (commit)
       via  1cfe9542265d1d2a36d7cd90751b2ed269b0fbd3 (commit)
      from  59919b1abf748166c0329fa1bfe5f3c3302670c2 (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 7d40532a3464eee6a26d303c378c44af95075698
Merge: 736fde9 39a9fd1
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 6 16:22:25 2011 +0200

    Merge branch 'fix-pr9579' into maint
    
    * fix-pr9579:
      tests: fix spurious failure in 'insthook.test'

commit 39a9fd16381469f911d42a3e27975edcb248bbf2
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 6 16:21:16 2011 +0200

    tests: fix spurious failure in 'insthook.test'
    
    * tests/insthook.test (Makefile.am): Add a proper `uninstall-hook'
    target to remove the symlink created by the `install-exec-hook'
    target; this prevents "make distcheck" from failing spuriously.
    Since we are at it, delete an extra blank line, and add a trailing
    `:' command.

commit 736fde9f6cf8d514ef30dc5d83fe2a41c3e22c9a
Merge: 59919b1 0773a99
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 6 16:14:46 2011 +0200

    Merge branch 'fix-pr9579' into maint
    
    * fix-pr9579:
      maintcheck: fix spurious failure
      regenerate Makefile.in

commit 0773a99888c8932c19b61145d78317278d2bdd66
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 6 16:10:40 2011 +0200

    maintcheck: fix spurious failure
    
    * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
    complaints from the `sc_no_brace_variable_expansions' maintainer
    check.

commit 1cfe9542265d1d2a36d7cd90751b2ed269b0fbd3
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 6 16:10:23 2011 +0200

    regenerate Makefile.in

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

Summary of changes:
 ChangeLog           |   16 ++++++++++++++++
 Makefile.in         |    2 +-
 lib/am/distdir.am   |    4 ++--
 tests/insthook.test |    6 +++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 019f2ac..eac0f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2011-10-06  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure in 'insthook.test'
+       * tests/insthook.test (Makefile.am): Add a proper `uninstall-hook'
+       target to remove the symlink created by the `install-exec-hook'
+       target; this prevents "make distcheck" from failing spuriously.
+       Since we are at it, delete an extra blank line, and add a trailing
+       `:' command.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failure
+       * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
+       complaints from the `sc_no_brace_variable_expansions' maintainer
+       check.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
        fix: make a test script executable
        * tests/nobase-nodist.test: Make executable.
 
diff --git a/Makefile.in b/Makefile.in
index e7ef862..9a03035 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,7 +152,7 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$'
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index ceb7e41..41ff14a 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -519,9 +519,9 @@ distuninstallcheck_listfiles = find . -type f -print
 ## The `dir' file (created by install-info) might still exist after
 ## uninstall, so we must be prepared to account for it.  The following
 ## check is not 100% strict, but is definitely good enough, and even
-## accounts for overridden ${infodir}.
+## accounts for overridden $(infodir).
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$'
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distuninstallcheck:
        @test -n '$(distuninstallcheck_dir)' || { \
          echo 'ERROR: trying to run $@ with an empty' \
diff --git a/tests/insthook.test b/tests/insthook.test
index a315447..1b03324 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -37,6 +37,9 @@ installcheck-local:
        test -f "$(bindir)/foo"
        test -f "$(bindir)/foo-$(VERSION)"
        : > $(top_srcdir)/../ok
+
+uninstall-hook:
+       rm -f $(DESTDIR)$(bindir)/foo-$(VERSION)
 END
 
 echo 1 > foo
@@ -63,7 +66,6 @@ grep 1 bin/foo-1.0
 grep 2 bin/foo-2.0
 grep 2 bin/foo
 
-
 # install-hook is an error.
 cat >>Makefile.am <<EOF
 install-hook:
@@ -73,3 +75,5 @@ EOF
 AUTOMAKE_fails
 grep install-data-hook stderr
 grep install-exec-hook stderr
+
+:


hooks/post-receive
-- 
GNU Automake