texinfo/texi2html ChangeLog texi2html.pl

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/07/17 07:57:38

Modified files:
        texi2html      : ChangeLog texi2html.pl 

Log message:
                * texi2html.pl: for split documents, append the extension to
                the out directory, and try with the new directory, if the normal
                one cannot be used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/ChangeLog?cvsroot=texinfo&r1=1.519&r2=1.520
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.400&r2=1.401

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/ChangeLog,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -b -r1.519 -r1.520
--- ChangeLog   17 Jul 2010 00:11:35 -0000      1.519
+++ ChangeLog   17 Jul 2010 07:57:37 -0000      1.520
@@ -1,3 +1,9 @@
+2010-07-18  Patrice Dumas  <address@hidden>
+
+       * texi2html.pl: for split documents, append the extension to
+       the out directory, and try with the new directory, if the normal
+       one cannot be used.
+
 2010-07-17  Patrice Dumas  <address@hidden>
 
        * texi2html.pl: accept --set-init-var VAR=VALUE syntax. Karl

Index: texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -b -r1.400 -r1.401
--- texi2html.pl        17 Jul 2010 00:11:37 -0000      1.400
+++ texi2html.pl        17 Jul 2010 07:57:37 -0000      1.401
@@ -90,7 +90,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.400 2010/07/17 00:11:37 pertusus Exp $
+# $Id: texi2html.pl,v 1.401 2010/07/17 07:57:37 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.gnu.org/software/texinfo/";;
@@ -4593,9 +4593,33 @@
             }
             else
             {
+               my $original_rdir = $docu_rdir;
+               # as explained in the doc, retry with the extension appended.
+               # this is dubious practice, but workaround extension-less info
+               # files
+               if (get_conf('SPLIT') and get_conf('EXTENSION') and 
get_conf('EXTENSION') ne '')
+               {
+                  $docu_rdir =~ s/\/*$//;
+                  $docu_rdir .= '.' . get_conf('EXTENSION') . '/';
+                  if (! -d $docu_rdir)
+                  {
+                     if ( mkdir($docu_rdir, oct(755)))
+                     {
+                        print STDERR "# created directory $docu_rdir\n" if 
($T2H_VERBOSE);
+                        push @created_directories, $docu_rdir;
+                     }
+                     else
+                     {
+                        document_error (sprintf(__("Can't create directories 
`%s' or `%s': %s"), $original_rdir, $docu_rdir, $!), 1);
+                     }
+                  }
+               }
+               else
+               {
                document_error (sprintf(__("Can't create directory `%s': %s"), 
$docu_rdir, $!), 1);
             }
         }
+        }
         print STDERR "# putting result files into directory $docu_rdir\n" if 
($T2H_VERBOSE);
       }
       else