New perldelta setup for 5.37.3

[perl5.git] / installhtml

diff --git a/installhtml b/installhtml
index 62e92fc..13d811f 100644 (file)
--- a/installhtml
+++ b/installhtml
@@ -2,12 +2,15 @@
 
 # This file should really be extracted from a .PL file
 
+$| = 1;
 use strict;
 use Config;            # for config options in the makefile
+use File::Path qw(remove_tree);
 use File::Spec::Functions qw(rel2abs no_upwards);
 use Getopt::Long;      # for command-line parsing
 use Cwd;
-use Pod::Html 1.23 qw(anchorify relativize_url);
+use Pod::Html 1.32;
+use Pod::Html::Util 1.32 qw(anchorify relativize_url);
 
 =head1 NAME
 
@@ -43,7 +46,7 @@ Default is current directory.
 =item B<--podpath> POD search path
 
 The list of directories to search for .pod and .pm files to be converted.
-Default is 'podroot/.'.
+Default is 'podroot/lib'.
 
 =item B<--recurse> recurse on subdirectories
 
@@ -119,7 +122,7 @@ Usage: $0 --help --podpath=<name>:...:<name> --podroot=<name>
 
     --help      - this message
     --podpath   - colon-separated list of directories containing .pod and
-                  .pm files to be converted (. by default).
+                  .pm files to be converted ('lib/' by default).
     --podroot   - filesystem base directory from which all relative paths in
                   podpath stem (default is .).
     --htmldir   - directory to store resulting html files in relative
@@ -144,7 +147,7 @@ END_OF_USAGE
 my (@podpath, $podroot, $htmldir, $htmlroot, $recurse, @splithead,
     @splititem, $splitpod, $verbose, $pod2html, @ignore);
 
-@podpath = ( "." );    # colon-separated list of directories containing .pod
+@podpath = ( "lib" );  # colon-separated list of directories containing .pod
                        # and .pm files to be converted.
 $podroot = ".";                # assume the pods we want are here
 $htmldir = "";         # nothing for now...
@@ -258,6 +261,8 @@ foreach my $dir (@splithead) {
     close(H);
 }
 
+remove_tree(@splitdirs, {safe=>1});
+
 ##############################################################################
 
 
@@ -378,10 +383,9 @@ sub split_on_item {
 
        # split the pod
        push(@$splitdirs, "$podroot/$dirname");
-       if (! -d "$podroot/$dirname") {
-           mkdir("$podroot/$dirname", 0755) ||
+       -d "$podroot/$dirname" and remove_tree("$podroot/$dirname", {safe=>1});
+       mkdir("$podroot/$dirname", 0755) ||
                    die "$0: error creating directory $podroot/$dirname: $!\n";
-       }
        chdir("$podroot/$dirname") ||
            die "$0: error changing to directory $podroot/$dirname: $!\n";
        die "$splitter not found. Use '-splitpod dir' option.\n"
@@ -437,9 +441,9 @@ sub splitpod {
     my $dir = $pod;
     $dir =~ s/\.pod//g;
     push(@$splitdirs, "$poddir/$dir");
+    -d "$poddir/$dir" and remove_tree("$poddir/$dir", {safe=>1});
     mkdir("$poddir/$dir", 0755) ||
-       die "$0: could not create directory $poddir/$dir: $!\n"
-       unless -d "$poddir/$dir";
+       die "$0: could not create directory $poddir/$dir: $!\n";
 
     $poddata[0] =~ /^\s*=head[1-6]\s+(.*)/;
     $section    = "";