Convert all "`'" quotes to "''" per new GNU Coding Standard guidelines.

Fixes Savannah bug #34530.

37 files changed, 94 insertions, 94 deletions

diff --git a/tests/mkshadow b/tests/mkshadow
index dfd054c..1413630 100755
--- a/tests/mkshadow
+++ b/tests/mkshadow
@@ -28,7 +28,7 @@ esac
 dest="$1"
 
 if [ ! -d "$dest" ]; then
-  echo "Destination directory \`$dest' must exist!"
+  echo "Destination directory '$dest' must exist!"
   exit 1
 fi
 
@@ -55,5 +55,5 @@ done
 
 rm -rf work
 
-echo "Shadow test suite created in \`$dest/$name'."
+echo "Shadow test suite created in '$dest/$name'."
 exit 0
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
index 88f62a9..294b289 100755
--- a/tests/run_make_tests.pl
+++ b/tests/run_make_tests.pl
@@ -318,7 +318,7 @@ sub set_more_defaults
    $mk or die "FATAL ERROR: Cannot determine the value of \$(MAKE):\n
 'echo \"all:;\@echo \\\$(MAKE)\" | $make_path -f-' failed!\n";
    $make_path = $mk;
-   print "Make\t= `$make_path'\n" if $debug;
+   print "Make\t= '$make_path'\n" if $debug;
 
    $string = `$make_path -v -f /dev/null 2> /dev/null`;
 
diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 3fe46a0..af4fa39 100644
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -25,7 +25,7 @@ run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
 
 # Use wildcards
 run_make_test('all: libxx.a(*.o)',
-              '', "#MAKE#: Nothing to be done for `all'.\n");
+              '', "#MAKE#: Nothing to be done for 'all'.\n");
 
 # Touch one of the .o's so it's rebuilt
 utouch(-30, 'a1.o');
diff --git a/tests/scripts/features/errors b/tests/scripts/features/errors
index 1e4be46..c0339cb 100644
--- a/tests/scripts/features/errors
+++ b/tests/scripts/features/errors
@@ -50,7 +50,7 @@ $delete_error_code = $? >> 8;
 
 $answer = "$rm_command cleanit
 $cleanit_error
-$makefile:2: recipe for target `clean' failed
+$makefile:2: recipe for target 'clean' failed
 $make_name: [clean] Error $delete_error_code (ignored)
 $rm_command foo\n";
 
@@ -78,7 +78,7 @@ if (!$vos)
 
 $answer = "$rm_command cleanit
 $cleanit_error
-$makefile:5: recipe for target `clean2' failed
+$makefile:5: recipe for target 'clean2' failed
 $make_name: [clean2] Error $delete_error_code (ignored)
 $rm_command foo\n";
 
diff --git a/tests/scripts/features/escape b/tests/scripts/features/escape
index 97a2994..36bab18 100644
--- a/tests/scripts/features/escape
+++ b/tests/scripts/features/escape
@@ -2,7 +2,7 @@
 $description = "Test various types of escaping in makefiles.";
 
 $details = "\
-Make sure that escaping of `:' works in target names.
+Make sure that escaping of ':' works in target names.
 Make sure escaping of whitespace works in target names.
 Make sure that escaping of '#' works.";
 
@@ -26,7 +26,7 @@ foo\#bar.ext: ; @echo "foo#bar.ext = ($@)"',
 
 run_make_test(undef,
 	      'path=pre:',
-	      "#MAKEFILE#:2: *** target pattern contains no `%'.  Stop.",
+	      "#MAKEFILE#:2: *** target pattern contains no '%'.  Stop.",
 	      512);
 
 # TEST 3: This one should work, since we escape the ":".
@@ -39,7 +39,7 @@ run_make_test(undef,
 
 run_make_test(undef,
 	      "'path=pre\\\\:'",
-	      "#MAKEFILE#:2: *** target pattern contains no `%'.  Stop.",
+	      "#MAKEFILE#:2: *** target pattern contains no '%'.  Stop.",
 	      512);
 
 # TEST 5: This one should work
diff --git a/tests/scripts/features/include b/tests/scripts/features/include
index ba8908c..ee014bd 100644
--- a/tests/scripts/features/include
+++ b/tests/scripts/features/include
@@ -1,6 +1,6 @@
 #                                     -*-mode: perl; rm-trailing-spaces: nil-*-
 
-$description = "Test various forms of the GNU make `include' command.";
+$description = "Test various forms of the GNU make 'include' command.";
 
 $details = "\
 Test include, -include, sinclude and various regressions involving them.
@@ -60,7 +60,7 @@ run_make_test
 error: foo.mk ; @echo $@
 ',
    '',
-   "#MAKE#: *** No rule to make target `foo.mk', needed by `error'.  Stop.\n",
+   "#MAKE#: *** No rule to make target 'foo.mk', needed by 'error'.  Stop.\n",
    512
   );
 
@@ -128,7 +128,7 @@ foo: baz
 bar: baz
 ',
 '',
-"#MAKE#: *** No rule to make target `baz', needed by `bar'.  Stop.\n",
+"#MAKE#: *** No rule to make target 'baz', needed by 'bar'.  Stop.\n",
 512);
 
 # Test that the diagnostics is issued even if the target has been
@@ -144,7 +144,7 @@ bar: baz
 baz: end
 ',
 '',
-"#MAKE#: *** No rule to make target `end', needed by `baz'.  Stop.\n",
+"#MAKE#: *** No rule to make target 'end', needed by 'baz'.  Stop.\n",
 512);
 
 # Test that the diagnostics is issued even if the target has been
@@ -162,7 +162,7 @@ baz: end
 ',
 '',
 "#MAKEFILE#:2: bar: No such file or directory
-#MAKE#: *** No rule to make target `end', needed by `baz'.  Stop.\n",
+#MAKE#: *** No rule to make target 'end', needed by 'baz'.  Stop.\n",
 512);
 
 if ($all_tests) {
@@ -172,7 +172,7 @@ if ($all_tests) {
 include foo
 foo: ; @echo foo = bar > $@
 !,
-                  '', "#MAKE#: `foo' is up to date.\n");
+                  '', "#MAKE#: 'foo' is up to date.\n");
     rmfiles('foo');
 }
 
diff --git a/tests/scripts/features/mult_rules b/tests/scripts/features/mult_rules
index 6f120f1..e706e17 100644
--- a/tests/scripts/features/mult_rules
+++ b/tests/scripts/features/mult_rules
@@ -47,7 +47,7 @@ else
                        $error_code);
 
 # Create the answer to what should be produced by this Makefile
-$answer = "$make_name: *** No rule to make target `extra.h', needed by `foo.o'.  Stop.\n";
+$answer = "$make_name: *** No rule to make target 'extra.h', needed by 'foo.o'.  Stop.\n";
 
 &compare_output($answer,&get_logfile(1));
 
diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism
index 909c979..d4250f0 100644
--- a/tests/scripts/features/parallelism
+++ b/tests/scripts/features/parallelism
@@ -99,14 +99,14 @@ ok:
 	\@sleep 4
 	\@echo Ok done",
               '-rR -j5', "Fail
-#MAKEFILE#:6: recipe for target `fail.1' failed
+#MAKEFILE#:6: recipe for target 'fail.1' failed
 #MAKE#: *** [fail.1] Error 1
 #MAKE#: *** Waiting for unfinished jobs....
 Fail
-#MAKEFILE#:6: recipe for target `fail.2' failed
+#MAKEFILE#:6: recipe for target 'fail.2' failed
 #MAKE#: *** [fail.2] Error 1
 Fail
-#MAKEFILE#:6: recipe for target `fail.3' failed
+#MAKEFILE#:6: recipe for target 'fail.3' failed
 #MAKE#: *** [fail.3] Error 1
 Ok done",
              512);
diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules
index 5cc6b94..0ff49a7 100644
--- a/tests/scripts/features/patternrules
+++ b/tests/scripts/features/patternrules
@@ -110,7 +110,7 @@ $(dir)/foo.bar:
 
 ',
 "dir=$dir",
-"#MAKEFILE#:6: recipe for target `$dir/foo.bar' failed
+"#MAKEFILE#:6: recipe for target '$dir/foo.bar' failed
 #MAKE#: *** [$dir/foo.bar] Error 1",
 512);
 
@@ -204,7 +204,7 @@ CWEAVE := :
 %.tex : %.w %.ch
 !,
               'foo.tex',
-              "#MAKE#: *** No rule to make target `foo.tex'.  Stop.", 512);
+              "#MAKE#: *** No rule to make target 'foo.tex'.  Stop.", 512);
 
 unlink(@f);
 
diff --git a/tests/scripts/features/recursion b/tests/scripts/features/recursion
index a6b8f90..fd5e351 100644
--- a/tests/scripts/features/recursion
+++ b/tests/scripts/features/recursion
@@ -18,7 +18,7 @@ last:
 ',
               ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
               ($vos
-               ? "#MAKE#: Entering directory `#PWD#'
+               ? "#MAKE#: Entering directory '#PWD#'
 make 'CFLAGS=-O' -f #MAKEFILE# foo
 make CFLAGS=-O
 MAKELEVEL = 0
@@ -26,20 +26,20 @@ make 'CFLAGS=-O' -f #MAKEFILE# last
 make CFLAGS=-O
 MAKELEVEL = 0
 THE END
-#MAKE#: Leaving directory `#PWD#'"
-               : "#MAKE#: Entering directory `#PWD#'
+#MAKE#: Leaving directory '#PWD#'"
+               : "#MAKE#: Entering directory '#PWD#'
 #MAKEPATH# -f #MAKEFILE# foo
-#MAKE#[1]: Entering directory `#PWD#'
+#MAKE#[1]: Entering directory '#PWD#'
 #MAKEPATH#
 MAKELEVEL = 1
 #MAKEPATH# -f #MAKEFILE# last
-#MAKE#[2]: Entering directory `#PWD#'
+#MAKE#[2]: Entering directory '#PWD#'
 #MAKEPATH#
 MAKELEVEL = 2
 THE END
-#MAKE#[2]: Leaving directory `#PWD#'
-#MAKE#[1]: Leaving directory `#PWD#'
-#MAKE#: Leaving directory `#PWD#'"));
+#MAKE#[2]: Leaving directory '#PWD#'
+#MAKE#[1]: Leaving directory '#PWD#'
+#MAKE#: Leaving directory '#PWD#'"));
 
 
 # Test command line overrides.
diff --git a/tests/scripts/features/se_explicit b/tests/scripts/features/se_explicit
index 79e0a36..f942a1c 100644
--- a/tests/scripts/features/se_explicit
+++ b/tests/scripts/features/se_explicit
@@ -115,7 +115,7 @@ run_make_test(q!
 .SECONDEXPANSION:
 all : $$(eval $$(info test))
 !,
-            '', "test\n#MAKE#: Nothing to be done for `all'.\n");
+            '', "test\n#MAKE#: Nothing to be done for 'all'.\n");
 
 # TEST #5: (NEGATIVE) catch eval in a prereq list trying to create new
 # target/prereq relationships.
diff --git a/tests/scripts/features/vpath b/tests/scripts/features/vpath
index a3aebd9..ec24165 100644
--- a/tests/scripts/features/vpath
+++ b/tests/scripts/features/vpath
@@ -74,7 +74,7 @@ vpath-d/a: fail.te
 vpath-d/b : fail.te
 vpath-d/fail.te:
 !,
-              '', "#MAKE#: Nothing to be done for `default'.\n");
+              '', "#MAKE#: Nothing to be done for 'default'.\n");
 
 rmdir('vpath-d');
 
diff --git a/tests/scripts/features/vpathgpath b/tests/scripts/features/vpathgpath
index f7683f5..5e6217b 100644
--- a/tests/scripts/features/vpathgpath
+++ b/tests/scripts/features/vpathgpath
@@ -57,7 +57,7 @@ sub touchfiles {
 
 push(@touchedfiles, "bar.c");
 
-$answer = "$make_name: Nothing to be done for `general'.\n";
+$answer = "$make_name: Nothing to be done for 'general'.\n";
 
 &compare_output($answer,&get_logfile(1));
 
diff --git a/tests/scripts/features/vpathplus b/tests/scripts/features/vpathplus
index c95c8ab..361788c 100644
--- a/tests/scripts/features/vpathplus
+++ b/tests/scripts/features/vpathplus
@@ -86,7 +86,7 @@ cat ${VP}foo.c bar.c > foo.b 2>/dev/null || exit 1
 
 $answer = "not creating notarget.c from notarget.d
 cat notarget.c > notarget.b 2>/dev/null || exit 1
-$makefile:16: recipe for target `notarget.b' failed
+$makefile:16: recipe for target 'notarget.b' failed
 $make_name: *** [notarget.b] Error 1
 ";
 
diff --git a/tests/scripts/functions/call b/tests/scripts/functions/call
index 98f1d92..9db9da7 100644
--- a/tests/scripts/functions/call
+++ b/tests/scripts/functions/call
@@ -13,7 +13,7 @@ print MAKEFILE <<'EOMAKE';
 #
 reverse = $2 $1
 
-# A complex `map' function, using recursive `call'.
+# A complex 'map' function, using recursive 'call'.
 #
 map = $(foreach a,$2,$(call $1,$a))
 
diff --git a/tests/scripts/functions/foreach b/tests/scripts/functions/foreach
index 9d1c464..4d1a11d 100644
--- a/tests/scripts/functions/foreach
+++ b/tests/scripts/functions/foreach
@@ -62,7 +62,7 @@ y = $x
 
 all: ; @echo $y',
               '',
-              "#MAKEFILE#:2: *** insufficient number of arguments (1) to function `foreach'.  Stop.",
+              "#MAKEFILE#:2: *** insufficient number of arguments (1) to function 'foreach'.  Stop.",
               512);
 
 run_make_test('
@@ -71,7 +71,7 @@ y := $x
 
 all: ; @echo $y',
               '',
-              "#MAKEFILE#:2: *** insufficient number of arguments (1) to function `foreach'.  Stop.",
+              "#MAKEFILE#:2: *** insufficient number of arguments (1) to function 'foreach'.  Stop.",
               512);
 
 1;
diff --git a/tests/scripts/functions/word b/tests/scripts/functions/word
index 34527ea..4dcc940 100644
--- a/tests/scripts/functions/word
+++ b/tests/scripts/functions/word
@@ -56,32 +56,32 @@ wordlist-e1: ; @echo $(wordlist ,,$(FOO))
 wordlist-e2: ; @echo $(wordlist abc ,,$(FOO))
 wordlist-e3: ; @echo $(wordlist 1, 12a ,$(FOO))',
               'word-e1',
-              "#MAKEFILE#:3: *** non-numeric first argument to `word' function: ''.  Stop.",
+              "#MAKEFILE#:3: *** non-numeric first argument to 'word' function: ''.  Stop.",
               512);
 
 run_make_test(undef,
               'word-e2',
-              "#MAKEFILE#:4: *** non-numeric first argument to `word' function: 'abc '.  Stop.",
+              "#MAKEFILE#:4: *** non-numeric first argument to 'word' function: 'abc '.  Stop.",
               512);
 
 run_make_test(undef,
               'word-e3',
-              "#MAKEFILE#:5: *** non-numeric first argument to `word' function: '1a'.  Stop.",
+              "#MAKEFILE#:5: *** non-numeric first argument to 'word' function: '1a'.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e1',
-              "#MAKEFILE#:7: *** non-numeric first argument to `wordlist' function: ''.  Stop.",
+              "#MAKEFILE#:7: *** non-numeric first argument to 'wordlist' function: ''.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e2',
-              "#MAKEFILE#:8: *** non-numeric first argument to `wordlist' function: 'abc '.  Stop.",
+              "#MAKEFILE#:8: *** non-numeric first argument to 'wordlist' function: 'abc '.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e3',
-              "#MAKEFILE#:9: *** non-numeric second argument to `wordlist' function: ' 12a '.  Stop.",
+              "#MAKEFILE#:9: *** non-numeric second argument to 'wordlist' function: ' 12a '.  Stop.",
               512);
 
 # Test error conditions again, but this time in a variable reference
@@ -94,37 +94,37 @@ WL = $(wordlist $s,$e,$(FOO))
 word-e: ; @echo $(W)
 wordlist-e: ; @echo $(WL)',
               'word-e x=',
-              "#MAKEFILE#:3: *** non-numeric first argument to `word' function: ''.  Stop.",
+              "#MAKEFILE#:3: *** non-numeric first argument to 'word' function: ''.  Stop.",
               512);
 
 run_make_test(undef,
               'word-e x=abc',
-              "#MAKEFILE#:3: *** non-numeric first argument to `word' function: 'abc'.  Stop.",
+              "#MAKEFILE#:3: *** non-numeric first argument to 'word' function: 'abc'.  Stop.",
               512);
 
 run_make_test(undef,
               'word-e x=0',
-              "#MAKEFILE#:3: *** first argument to `word' function must be greater than 0.  Stop.",
+              "#MAKEFILE#:3: *** first argument to 'word' function must be greater than 0.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e s= e=',
-              "#MAKEFILE#:4: *** non-numeric first argument to `wordlist' function: ''.  Stop.",
+              "#MAKEFILE#:4: *** non-numeric first argument to 'wordlist' function: ''.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e s=abc e=',
-              "#MAKEFILE#:4: *** non-numeric first argument to `wordlist' function: 'abc'.  Stop.",
+              "#MAKEFILE#:4: *** non-numeric first argument to 'wordlist' function: 'abc'.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e s=4 e=12a',
-              "#MAKEFILE#:4: *** non-numeric second argument to `wordlist' function: '12a'.  Stop.",
+              "#MAKEFILE#:4: *** non-numeric second argument to 'wordlist' function: '12a'.  Stop.",
               512);
 
 run_make_test(undef,
               'wordlist-e s=0 e=12',
-              "#MAKEFILE#:4: *** invalid first argument to `wordlist' function: `0'.  Stop.",
+              "#MAKEFILE#:4: *** invalid first argument to 'wordlist' function: '0'.  Stop.",
               512);
 
 
diff --git a/tests/scripts/misc/general3 b/tests/scripts/misc/general3
index b3142c2..8ad0f8e 100644
--- a/tests/scripts/misc/general3
+++ b/tests/scripts/misc/general3
@@ -26,7 +26,7 @@ TAB =   \t  \# A TAB and some spaces
 \$(STR)
 
 \$(STR) \$(TAB)",
-              '', "#MAKE#: Nothing to be done for `all'.");
+              '', "#MAKE#: Nothing to be done for 'all'.");
 
 # TEST 2
 
diff --git a/tests/scripts/options/dash-B b/tests/scripts/options/dash-B
index e36842e..9c708b7 100644
--- a/tests/scripts/options/dash-B
+++ b/tests/scripts/options/dash-B
@@ -22,13 +22,13 @@ foo: bar.x
 ',
               '', 'cp bar.x foo');
 
-run_make_test(undef, '', "#MAKE#: Nothing to be done for `all'.");
+run_make_test(undef, '', "#MAKE#: Nothing to be done for 'all'.");
 run_make_test(undef, '-B', 'cp bar.x foo');
 
 # Put the timestamp for foo into the future; it should still be remade.
 
 utouch(1000, 'foo');
-run_make_test(undef, '', "#MAKE#: Nothing to be done for `all'.");
+run_make_test(undef, '', "#MAKE#: Nothing to be done for 'all'.");
 run_make_test(undef, '-B', 'cp bar.x foo');
 
 # Clean up
diff --git a/tests/scripts/options/dash-C b/tests/scripts/options/dash-C
index 5864ffd..42d0a8b 100644
--- a/tests/scripts/options/dash-C
+++ b/tests/scripts/options/dash-C
@@ -34,9 +34,9 @@ if (-f $example) {
 }
 
 # Create the answer to what should be produced by this Makefile
-$answer = "$make_name: Entering directory `$wpath'\n"
+$answer = "$make_name: Entering directory '$wpath'\n"
         . "$delete_command EXAMPLE\n"
-        . "$make_name: Leaving directory `$wpath'\n";
+        . "$make_name: Leaving directory '$wpath'\n";
 
 &compare_output($answer,&get_logfile(1));
 
@@ -62,9 +62,9 @@ if (-f $example) {
 }
 
 # Create the answer to what should be produced by this Makefile
-$answer = "$make_name: Entering directory `$wpath'\n"
+$answer = "$make_name: Entering directory '$wpath'\n"
         . "$delete_command EXAMPLEslash\n"
-        . "$make_name: Leaving directory `$wpath'\n";
+        . "$make_name: Leaving directory '$wpath'\n";
 
 &compare_output($answer,&get_logfile(1));
 
diff --git a/tests/scripts/options/dash-I b/tests/scripts/options/dash-I
index 8dc5d9b..d47a8d8 100644
--- a/tests/scripts/options/dash-I
+++ b/tests/scripts/options/dash-I
@@ -51,9 +51,9 @@ $answer = "This is another included makefile\n";
 
 
 $answer = "$mkpath ANOTHER -f $makefile
-${make_name}[1]: Entering directory `$pwd'
+${make_name}[1]: Entering directory '$pwd'
 This is another included makefile
-${make_name}[1]: Leaving directory `$pwd'\n";
+${make_name}[1]: Leaving directory '$pwd'\n";
 
 &run_make_with_options($makefile,"-I $workdir recurse",&get_logfile);
 &compare_output($answer,&get_logfile(1));
diff --git a/tests/scripts/options/dash-W b/tests/scripts/options/dash-W
index d3fde87..20b9f74 100644
--- a/tests/scripts/options/dash-W
+++ b/tests/scripts/options/dash-W
@@ -12,7 +12,7 @@ a.x b.x: ; echo >> $@
 
 # Run it again: nothing should happen
 
-run_make_test(undef, '', "#MAKE#: `a.x' is up to date.");
+run_make_test(undef, '', "#MAKE#: 'a.x' is up to date.");
 
 # Now run it with -W b.x: should rebuild a.x
 
@@ -21,7 +21,7 @@ run_make_test(undef, '-W b.x', 'echo >> a.x');
 # Put the timestamp for a.x into the future; it should still be remade.
 
 utouch(1000, 'a.x');
-run_make_test(undef, '', "#MAKE#: `a.x' is up to date.");
+run_make_test(undef, '', "#MAKE#: 'a.x' is up to date.");
 run_make_test(undef, '-W b.x', 'echo >> a.x');
 
 # Clean up
diff --git a/tests/scripts/options/dash-k b/tests/scripts/options/dash-k
index 40d9b97..e784e0d 100644
--- a/tests/scripts/options/dash-k
+++ b/tests/scripts/options/dash-k
@@ -57,10 +57,10 @@ else {
 
 # Create the answer to what should be produced by this Makefile
 $answer = "cc -c main.c
-$make_name: *** No rule to make target `kbd.c', needed by `kbd.o'.
+$make_name: *** No rule to make target 'kbd.c', needed by 'kbd.o'.
 cc -c commands.c
 cc -c display.c
-$make_name: Target `edit' not remade because of errors.\n";
+$make_name: Target 'edit' not remade because of errors.\n";
 
 # COMPARE RESULTS
 
@@ -92,9 +92,9 @@ close(MAKEFILE);
 &run_make_with_options($makefile2, "-k", &get_logfile, $error_code);
 
 $answer = "exit 1
-$makefile2:9: recipe for target `foo.o' failed
+$makefile2:9: recipe for target 'foo.o' failed
 $make_name: *** [foo.o] Error 1
-$make_name: Target `all' not remade because of errors.\n";
+$make_name: Target 'all' not remade because of errors.\n";
 
 &compare_output($answer, &get_logfile(1));
 
@@ -107,8 +107,8 @@ ifile: no-such-file; @false
 ',
               '-k',
               "#MAKEFILE#:2: ifile: No such file or directory
-#MAKE#: *** No rule to make target `no-such-file', needed by `ifile'.
-#MAKE#: Failed to remake makefile `ifile'.
+#MAKE#: *** No rule to make target 'no-such-file', needed by 'ifile'.
+#MAKE#: Failed to remake makefile 'ifile'.
 hi\n",
               512);
 
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index 248e0c8..1953909 100644
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -56,13 +56,13 @@ close(MAKEFILE);
 # TEST 2
 
 &run_make_with_options($makefile2, "", &get_logfile);
-$answer = "$make_name: `a' is up to date.\n";
+$answer = "$make_name: 'a' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST 3
 
 &run_make_with_options($makefile2, "-n", &get_logfile);
-$answer = "$make_name: `a' is up to date.\n";
+$answer = "$make_name: 'a' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST 4
diff --git a/tests/scripts/options/symlinks b/tests/scripts/options/symlinks
index 40d2564..a1bfce0 100644
--- a/tests/scripts/options/symlinks
+++ b/tests/scripts/options/symlinks
@@ -26,7 +26,7 @@ if ($port_type eq 'W32' || !( eval { symlink("",""); 1 })) {
   # Without -L, nothing should happen
   # With -L, it should update targ
   run_make_test('targ: sym ; @echo make $@ from $<', '',
-                "#MAKE#: `targ' is up to date.");
+                "#MAKE#: 'targ' is up to date.");
   run_make_test(undef, '-L', "make targ from sym");
 
   # Now update dep; in all cases targ should be out of date.
@@ -36,8 +36,8 @@ if ($port_type eq 'W32' || !( eval { symlink("",""); 1 })) {
 
   # Now update targ; in all cases targ should be up to date.
   &touch('targ');
-  run_make_test(undef, '', "#MAKE#: `targ' is up to date.");
-  run_make_test(undef, '-L', "#MAKE#: `targ' is up to date.");
+  run_make_test(undef, '', "#MAKE#: 'targ' is up to date.");
+  run_make_test(undef, '-L', "#MAKE#: 'targ' is up to date.");
 
   # Add in a new link between sym and dep.  Be sure it's newer than targ.
   sleep(1);
@@ -46,7 +46,7 @@ if ($port_type eq 'W32' || !( eval { symlink("",""); 1 })) {
 
   # Without -L, nothing should happen
   # With -L, it should update targ
-  run_make_test(undef, '', "#MAKE#: `targ' is up to date.");
+  run_make_test(undef, '', "#MAKE#: 'targ' is up to date.");
   run_make_test(undef, '-L', "make targ from sym");
 
   rmfiles('targ', 'dep', 'sym', 'dep1');
@@ -56,7 +56,7 @@ if ($port_type eq 'W32' || !( eval { symlink("",""); 1 })) {
 
   symlink("../$dirname/dep", 'sym');
   run_make_test('targ: sym ; @echo make $@ from $<', '',
-                "#MAKE#: *** No rule to make target `sym', needed by `targ'.  Stop.", 512);
+                "#MAKE#: *** No rule to make target 'sym', needed by 'targ'.  Stop.", 512);
 
   run_make_test('targ: sym ; @echo make $@ from $<', '-L',
                 'make targ from sym');
diff --git a/tests/scripts/options/warn-undefined-variables b/tests/scripts/options/warn-undefined-variables
index 34bfaea..ce15507 100644
--- a/tests/scripts/options/warn-undefined-variables
+++ b/tests/scripts/options/warn-undefined-variables
@@ -18,8 +18,8 @@ all: ; @echo ref $(EREF) $(UREF)',
 
 # With --warn-undefined-variables, it should warn me
 run_make_test(undef, '--warn-undefined-variables',
-              "#MAKEFILE#:7: warning: undefined variable `UNDEFINED'
-#MAKEFILE#:9: warning: undefined variable `UNDEFINED'
+              "#MAKEFILE#:7: warning: undefined variable 'UNDEFINED'
+#MAKEFILE#:9: warning: undefined variable 'UNDEFINED'
 ref");
 
 1;
diff --git a/tests/scripts/targets/DEFAULT b/tests/scripts/targets/DEFAULT
index 0cabde9..f3d5148 100644
--- a/tests/scripts/targets/DEFAULT
+++ b/tests/scripts/targets/DEFAULT
@@ -35,9 +35,9 @@ close(MAKEFILE);
 &run_make_with_options($makefile,'bar',&get_logfile);
 
 # Create the answer to what should be produced by this Makefile
-$answer = "${make_name}[1]: Entering directory `$pwd'\n"
+$answer = "${make_name}[1]: Entering directory '$pwd'\n"
         . "Executing rule BAR\n"
-        . "${make_name}[1]: Leaving directory `$pwd'\n";
+        . "${make_name}[1]: Leaving directory '$pwd'\n";
 
 # COMPARE RESULTS
 
diff --git a/tests/scripts/targets/INTERMEDIATE b/tests/scripts/targets/INTERMEDIATE
index 4fdd7a2..2b3021b 100644
--- a/tests/scripts/targets/INTERMEDIATE
+++ b/tests/scripts/targets/INTERMEDIATE
@@ -42,7 +42,7 @@ $answer = "cp foo.f foo.e\ncp foo.e foo.d\nrm foo.e\n";
 # TEST #1
 
 &run_make_with_options($makefile,'foo.d',&get_logfile);
-$answer = "$make_name: `foo.d' is up to date.\n";
+$answer = "$make_name: 'foo.d' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST #2
@@ -63,7 +63,7 @@ $answer = "cp foo.f foo.e\ncp bar.f bar.e\ncat foo.e bar.e > foo.c\nrm bar.e foo
 # TEST #4
 
 &run_make_with_options($makefile,'foo.c',&get_logfile);
-$answer = "$make_name: `foo.c' is up to date.\n";
+$answer = "$make_name: 'foo.c' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST #5
diff --git a/tests/scripts/targets/POSIX b/tests/scripts/targets/POSIX
index 5f854be..35c59b1 100644
--- a/tests/scripts/targets/POSIX
+++ b/tests/scripts/targets/POSIX
@@ -17,7 +17,7 @@ run_make_test(qq!
 .POSIX:
 all: ; \@$script
 !,
-              '', "#MAKEFILE#:3: recipe for target `all' failed
+              '', "#MAKEFILE#:3: recipe for target 'all' failed
 #MAKE#: *** [all] Error $err\n", 512);
 
 # User settings must override .POSIX
diff --git a/tests/scripts/targets/SECONDARY b/tests/scripts/targets/SECONDARY
index 26515d8..447c275 100644
--- a/tests/scripts/targets/SECONDARY
+++ b/tests/scripts/targets/SECONDARY
@@ -44,7 +44,7 @@ $answer = "cp foo.f foo.e\ncp foo.e foo.d\n";
 unlink('foo.e');
 
 &run_make_with_options($makefile,'foo.d',&get_logfile);
-$answer = "$make_name: `foo.d' is up to date.\n";
+$answer = "$make_name: 'foo.d' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST #3
@@ -67,7 +67,7 @@ $answer = "cp foo.e foo.c\n";
 unlink('foo.e');
 
 &run_make_with_options($makefile,'foo.c',&get_logfile);
-$answer = "$make_name: `foo.c' is up to date.\n";
+$answer = "$make_name: 'foo.c' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 # TEST #6
@@ -103,7 +103,7 @@ close(MAKEFILE);
 touch('final');
 
 &run_make_with_options($makefile2, '', &get_logfile);
-$answer = "$make_name: `final' is up to date.\n";
+$answer = "$make_name: 'final' is up to date.\n";
 &compare_output($answer, &get_logfile(1));
 
 unlink('source', 'final', 'intermediate');
diff --git a/tests/scripts/variables/DEFAULT_GOAL b/tests/scripts/variables/DEFAULT_GOAL
index 1c06506..8188ce7 100644
--- a/tests/scripts/variables/DEFAULT_GOAL
+++ b/tests/scripts/variables/DEFAULT_GOAL
@@ -42,7 +42,7 @@ run_make_test('
 .DEFAULT_GOAL = foo
 ',
 '',
-'#MAKE#: *** No rule to make target `foo\'.  Stop.',
+"#MAKE#: *** No rule to make target 'foo'.  Stop.",
 512);
 
 
diff --git a/tests/scripts/variables/LIBPATTERNS b/tests/scripts/variables/LIBPATTERNS
index 826f2fa..9182954 100644
--- a/tests/scripts/variables/LIBPATTERNS
+++ b/tests/scripts/variables/LIBPATTERNS
@@ -20,7 +20,7 @@ run_make_test('
 .LIBPATTERNS = mtest_foo.a mtest_%.a
 all: -lfoo ; @echo "build $@ from $<"
 ',
-              '', "#MAKE#: .LIBPATTERNS element `mtest_foo.a' is not a pattern
+              '', "#MAKE#: .LIBPATTERNS element 'mtest_foo.a' is not a pattern
 build all from mtest_foo.a\n");
 
 # TEST 2: target-specific override
diff --git a/tests/scripts/variables/MAKE b/tests/scripts/variables/MAKE
index d1081da..dc62160 100644
--- a/tests/scripts/variables/MAKE
+++ b/tests/scripts/variables/MAKE
@@ -16,8 +16,8 @@ foo:
 !,
               '',
               "#MAKEPATH#\n#MAKEPATH# -f #MAKEFILE# foo\n"
-              . "#MAKE#[1]: Entering directory `#PWD#'\n"
-              . "#MAKEPATH#\n#MAKE#[1]: Leaving directory `#PWD#'\n");
+              . "#MAKE#[1]: Entering directory '#PWD#'\n"
+              . "#MAKEPATH#\n#MAKE#[1]: Leaving directory '#PWD#'\n");
 
 rmfiles("foo");
 
diff --git a/tests/scripts/variables/MAKE_RESTARTS b/tests/scripts/variables/MAKE_RESTARTS
index 53ab738..711c627 100644
--- a/tests/scripts/variables/MAKE_RESTARTS
+++ b/tests/scripts/variables/MAKE_RESTARTS
@@ -53,9 +53,9 @@ foo.x:1: bar.x: No such file or directory
 MAKE_RESTARTS=2
 recurse MAKE_RESTARTS=
 MAKE_RESTARTS=
-#MAKE#[1]: Entering directory `#PWD#'
+#MAKE#[1]: Entering directory '#PWD#'
 all MAKE_RESTARTS=
-#MAKE#[1]: Leaving directory `#PWD#'");
+#MAKE#[1]: Leaving directory '#PWD#'");
 
 rmfiles('foo.x', 'bar.x');
 
diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL
index 3d49349..4c73890 100644
--- a/tests/scripts/variables/SHELL
+++ b/tests/scripts/variables/SHELL
@@ -89,7 +89,7 @@ run_make_test(qq!
 .SHELLFLAGS = $flags
 all: ; \@$script
 !,
-              '', "$out#MAKEFILE#:3: recipe for target `all' failed
+              '', "$out#MAKEFILE#:3: recipe for target 'all' failed
 #MAKE#: *** [all] Error $err\n", 512);
 
 1;
diff --git a/tests/scripts/variables/define b/tests/scripts/variables/define
index 68d493b..7324cbc 100644
--- a/tests/scripts/variables/define
+++ b/tests/scripts/variables/define
@@ -160,7 +160,7 @@ ouch
 endef
 all: ; @echo ok
 ',
-              '', "#MAKEFILE#:3: extraneous text after `define' directive\nok\n");
+              '', "#MAKEFILE#:3: extraneous text after 'define' directive\nok\n");
 
 # TEST 7: NEGATIVE: extra text after endef
 
@@ -171,7 +171,7 @@ ouch
 endef $(NAME)
 all: ; @echo ok
 ',
-              '', "#MAKEFILE#:5: extraneous text after `endef' directive\nok\n");
+              '', "#MAKEFILE#:5: extraneous text after 'endef' directive\nok\n");
 
 # TEST 8: NEGATIVE: missing endef
 
@@ -182,7 +182,7 @@ define NAME =
 ouch
 endef$(NAME)
 ',
-              '', "#MAKEFILE#:4: *** missing `endef', unterminated `define'.  Stop.\n", 512);
+              '', "#MAKEFILE#:4: *** missing 'endef', unterminated 'define'.  Stop.\n", 512);
 
 # -------------------------
 # Make sure that prefix characters apply properly to define/endef values.
diff --git a/tests/test_driver.pl b/tests/test_driver.pl
index 4ec3a11..30d2ab7 100644
--- a/tests/test_driver.pl
+++ b/tests/test_driver.pl
@@ -132,7 +132,7 @@ sub toplevel
 
   &parse_command_line (@ARGV);
 
-  print "OS name = `$osname'\n" if $debug;
+  print "OS name = '$osname'\n" if $debug;
 
   $workpath = "$cwdslash$workdir";
   $scriptpath = "$cwdslash$scriptdir";