From: Peter Rosin <peda@lysator.liu.se>
Date: Sat, 26 Nov 2011 13:54:00 +0000 (+0100)
Subject: tests: fix 'distcheck-override-infodir.test' on Cygwin
X-Git-Tag: v1.12.0b~221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7983a0f81d2135387138b563acac6ad0fb0f5f8;p=platform%2Fupstream%2Fautomake.git

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).
---

diff --git a/ChangeLog b/ChangeLog
index a8e6587..2ad35bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-28  Peter Rosin  <peda@lysator.liu.se>
+
+	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  <stefano.lattarini@gmail.com>
 
 	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