Fix failing Time-Piece tests on Win32

[p5sagit/p5-mst-13.2.git] / pod / buildtoc

diff --git a/pod/buildtoc b/pod/buildtoc
index 705317a..4054fda 100644 (file)
--- a/pod/buildtoc
+++ b/pod/buildtoc
@@ -33,6 +33,7 @@ $masterpodfile = File::Spec->catdir($Up, "pod.lst");
      podmak => File::Spec->catdir($Up, "win32", "pod.mak"),
      # plan9 =>  File::Spec->catdir($Up, "plan9", "mkfile"),
      unix => File::Spec->catdir($Up, "Makefile.SH"),
+     # TODO: add roffitall
     );
 
 {
@@ -273,7 +274,7 @@ close MASTER;
   }
 }
 
-# OK. Now a lot of ancillay function definitions follow
+# OK. Now a lot of ancillary function definitions follow
 # Main program returns at "Do stuff"
 
 sub path2modname {
@@ -382,6 +383,8 @@ sub podset {
            unhead1();
            output "\n \n\n=head2 ";
            $_ = <>;
+           # Remove svn keyword expansions from the Perl FAQ
+           s/ \(\$Revision: \d+ \$\)//g;
            if ( /^\s*$pod\b/ ) {
                s/$pod\.pm/$pod/;       # '.pm' in NAME !?
                output $_;
@@ -608,7 +611,7 @@ sub do_nmake {
   1 while $makefile =~ s/\0\tcopy .*\n/\0/gm;
   $makefile =~ s/\0+/join ("", &generate_nmake_1)/se;
 
-  $makefile =~ s{(del /f [^\n]+checkpods[^\n]+).*?(pod2html)}
+  $makefile =~ s{(del /f [^\n]+podchecker[^\n]+).*?(pod2html)}
     {"$1\n" . &generate_nmake_2."\n\t    $2"}se;
   $makefile;
 }
@@ -627,7 +630,7 @@ sub do_perlpod {
                   )+
                  }
          {$1 . join "", &generate_perlpod}mxe) {
-    die "$0: Failed to insert ammendments in do_perlpod";
+    die "$0: Failed to insert amendments in do_perlpod";
   }
   $pod;
 }