Changes for Perl 5, from Gord Matzigkeit

diff --git a/automake.in b/automake.in
index 1a2a333f9404825c0d1b23f4ce82d17d8ec1023d..df3ef62a86a2f00e2095c58832cc5e139fe5cb72 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -425,7 +425,7 @@ sub handle_programs
                $output_vars .= $one_file . '_LDADD = ${LDADD}' . "\n";
            }
 
-           ($munge = $fcont) =~ s/@PROGRAM@/$one_file/g;
+           ($munge = $fcont) =~ s/\@PROGRAM\@/$one_file/g;
            $output_rules .= $munge;
        }
     }
@@ -452,7 +452,7 @@ sub handle_libraries
            $output_vars .= $onelib . "_LIBADD =\n";
        }
 
-       ($munge = $onefile) =~ s/@LIBRARY@/$onelib/g;
+       ($munge = $onefile) =~ s/\@LIBRARY\@/$onelib/g;
        $output_rules .= $munge;
     }
 
@@ -519,7 +519,7 @@ sub handle_texinfo
        push (@clean, 'vti');
 
        local ($tfile);
-       ($tfile = &file_contents ('texi-version')) =~ s/@TEXI@/$texis[0]/g;
+       ($tfile = &file_contents ('texi-version')) =~ s/\@TEXI\@/$texis[0]/g;
        $output_rules = $output_rules . $tfile;
 
        &require_file ('mdate-sh');
@@ -593,10 +593,10 @@ sub handle_man_pages
     foreach $key (keys %inames)
     {
        $_ = $install_man_format;
-       s/@SECTION@/$secmap{$key}/g;
-       s/@MAN@/$inames{$key}/g;
-       s/@FULLSECT@/$fullsecmap{$key}/g;
-       s/@MANBASE@/$key/g;
+       s/\@SECTION\@/$secmap{$key}/g;
+       s/\@MAN\@/$inames{$key}/g;
+       s/\@FULLSECT\@/$fullsecmap{$key}/g;
+       s/\@MANBASE\@/$key/g;
        $output_rules .= $_;
     }
     $output_rules .= "\n";
@@ -605,10 +605,10 @@ sub handle_man_pages
     foreach $key (keys %inames)
     {
        $_ = $uninstall_man_format;
-       s/@SECTION@/$secmap{$key}/g;
-       s/@MAN@/$inames{$key}/g;
-       s/@FULLSECT@/$fullsecmap{$key}/g;
-       s/@MANBASE@/$key/g;
+       s/\@SECTION\@/$secmap{$key}/g;
+       s/\@MAN\@/$inames{$key}/g;
+       s/\@FULLSECT\@/$fullsecmap{$key}/g;
+       s/\@MANBASE\@/$key/g;
        $output_rules .= $_;
     }
     $output_rules .= "\n";
@@ -1002,8 +1002,8 @@ sub do_one_clean_target
     {
        # Print a special warning.
        $output_rules .=
-           ("\t@echo \"This command is intended for maintainers to use;\"\n"
-            . "\t@echo \"it deletes files that may require special "
+           ("\t\@echo \"This command is intended for maintainers to use;\"\n"
+            . "\t\@echo \"it deletes files that may require special "
             . "tools to rebuild.\"\n");
     }
     $output_rules .= "\n";