* tests/mkinst3.test: Fix `mkdir' wrapper to not be confused

if ``pwd`' contains the string `-p'.  Create the wrapper in a
subdirectory so that `.' in $PATH does not lead to an endless
loop.

diff --git a/ChangeLog b/ChangeLog
index 0d02550d9a340b71655ea4ca56e106ec549133f9..fa126d42b2f6c809139f9609427ebeacd64f4f80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/mkinst3.test: Fix `mkdir' wrapper to not be confused
+       if ``pwd`' contains the string `-p'.  Create the wrapper in a
+       subdirectory so that `.' in $PATH does not lead to an endless
+       loop.
+
        * lib/depcomp (ia64hp): Rename dependency style to..
        (hp2): ..this, as it works with aCC on HPPA, too; adjust
        comment.  Report by Olivier Fourdan (PR automake/481).

diff --git a/tests/mkinst3.test b/tests/mkinst3.test
index d55a94d2d5eff126207ae725f6c16ac3048bdc3d..268a26b243dee0d5bf24654ea95250bcd95284a6 100755 (executable)
--- a/tests/mkinst3.test
+++ b/tests/mkinst3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -39,20 +39,24 @@ rm -rf '~a b'
 
 # Trick mkinstalldirs into thinking mkdir does not support -p.
 
-cat >mkdir <<'EOF'
+mkdir bin
+cat >bin/mkdir <<'EOF'
 #!/bin/sh
-case "$*" in
-  *-p*) exit 1;;
-esac
+for arg
+do
+  case $arg in
+  -p) exit 1;;
+  esac
+done
 PATH=$AM_PATH
 export PATH
 exec mkdir "$@"
 EOF
 
-chmod +x mkdir
+chmod +x bin/mkdir
 AM_PATH=$PATH
 export AM_PATH
-PATH=`pwd`:$PATH
+PATH=`pwd`/bin:$PATH
 export PATH
 
 # Test mkinstalldirs without mkdir -p.