Merge branch 'maint'

[platform/upstream/automake.git] / tests / install-info-dir.test

diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index 405480d..c76f424 100755 (executable)
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Checks on the `install-info' target.
+# Checks on the 'install-info' target.
 # Details about the individual checks' purposes and motivations are
 # inlined, below.
 
 # FIXME: this test is a good candidate for a conversion to TAP,
-# FIXME: and could be merged with `txinfo27.test'.
+# FIXME: and could be merged with 'txinfo27.test'.
 
 required=makeinfo
 . ./defs || Exit 1
@@ -30,9 +30,7 @@ mkdir bin
 saved_PATH=$PATH; export saved_PATH
 PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH
 
-set -e
-
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
 AC_OUTPUT
 END
 
@@ -44,8 +42,8 @@ cat > foo.texi << 'END'
 \input texinfo
 @setfilename foo.info
 @c All the following directives might be required to allow older
-@c versions of the `install-info' program (e.g., version 4.8) to
-@c create the `dir' index file in ${infodir}.  Don't remove them.
+@c versions of the 'install-info' program (e.g., version 4.8) to
+@c create the 'dir' index file in ${infodir}.  Don't remove them.
 @settitle foo
 @dircategory Dummy utilities
 @direntry
@@ -74,8 +72,8 @@ else
   have_installinfo=no
 fi
 
-# The `install-info' target updates the `${infodir}/dir' file
-# by default (if the `install-info' program is available).
+# The 'install-info' target updates the '${infodir}/dir' file
+# by default (if the 'install-info' program is available).
 # This should happen in a normal as well as in a DESTDIR installation.
 if test $have_installinfo = yes; then
 
@@ -104,7 +102,7 @@ fi
 
 rm -rf $instdir $destdir
 
-# The `install-info' target doesn't fail if the `install-info'
+# The 'install-info' target doesn't fail if the 'install-info'
 # program is not available.
 cat > bin/install-info <<'END'
 #!/bin/sh
@@ -121,7 +119,7 @@ grep 'error from install-info' output && Exit 1
 rm -rf $instdir output
 
 if test $have_installinfo = yes; then
-  # The `install-info' target doesn't try to guess whether the `install-info'
+  # The 'install-info' target doesn't try to guess whether the 'install-info'
   # is the GNU or debian version.
   unindent > bin/install-info <<'END'
     #!/bin/sh
@@ -146,8 +144,8 @@ fi
 
 rm -rf $instdir bin/install-info
 
-# The `AM_UPDATE_INFO_DIR' environment variable can be used to
-# prevent the creation or update of the `${infodir}/dir' file,
+# The 'AM_UPDATE_INFO_DIR' environment variable can be used to
+# prevent the creation or update of the '${infodir}/dir' file,
 # if set to a "no" value.
 for val in no NO n; do
   rm -rf $instdir