[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-544-ga7983a0

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

The branch, maint has been updated
       via  a7983a0f81d2135387138b563acac6ad0fb0f5f8 (commit)
      from  39a0fd0267ca5aab3d7c4677586181c355233eef (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 a7983a0f81d2135387138b563acac6ad0fb0f5f8
Author: Peter Rosin <address@hidden>
Date:   Sat Nov 26 14:54:00 2011 +0100

    tests: fix 'distcheck-override-infodir.test' on Cygwin
    
    * tests/distcheck-override-infodir.test (Makefile.am): Do not add
    any `/' between $(DESTDIR) and the following paths.  Otherwise,
    when $(DESTDIR) is empty, the recipes will try to access files
    with a leading double slash, which have an implementation-defined
    interpretation (e.g., for Cygwin, they mean UNC paths).

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

Summary of changes:
 ChangeLog                             |    9 +++++++++
 tests/distcheck-override-infodir.test |    8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8e6587..2ad35bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-28  Peter Rosin  <address@hidden>
+
+       tests: fix 'distcheck-override-infodir.test' on Cygwin
+       * tests/distcheck-override-infodir.test (Makefile.am): Do not add
+       any `/' between $(DESTDIR) and the following paths.  Otherwise,
+       when $(DESTDIR) is empty, the recipes will try to access files
+       with a leading double slash, which have an implementation-defined
+       interpretation (e.g., for Cygwin, they mean UNC paths).
+
 2011-11-24  Stefano Lattarini  <address@hidden>
 
        cosmetics: typofix in comments
diff --git a/tests/distcheck-override-infodir.test 
b/tests/distcheck-override-infodir.test
index 19ad3d1..3cf38c5 100755
--- a/tests/distcheck-override-infodir.test
+++ b/tests/distcheck-override-infodir.test
@@ -32,11 +32,11 @@ info_TEXINFOS = main.texi
 ## Sanity check.
 installcheck-local:
        if test x$${infodir+set} != xset; then \
-         ls -l "$(DESTDIR)/$(prefix)/blah/blah/foobar/" || exit 1; \
-         test -f "$(DESTDIR)/$(prefix)/blah/blah/foobar/dir" || exit 1; \
+         ls -l "$(DESTDIR)$(prefix)/blah/blah/foobar/" || exit 1; \
+         test -f "$(DESTDIR)$(prefix)/blah/blah/foobar/dir" || exit 1; \
        else \
-         ls -l "$(DESTDIR)/$$infodir/" || exit 1; \
-         test -f "$(DESTDIR)/$$infodir/dir" || exit 1; \
+         ls -l "$(DESTDIR)$$infodir/" || exit 1; \
+         test -f "$(DESTDIR)$$infodir/dir" || exit 1; \
        fi
 END
 


hooks/post-receive
-- 
GNU Automake