texinfo texi2html/test/manuals/tests.txt tp/Tex...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/04/03 23:07:36

Modified files:
        texi2html/test/manuals: tests.txt 
        tp/Texinfo/Convert: Info.pm 

Log message:
        Use --format and not init files.
        output_dir is renamed destination_directory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/manuals/tests.txt?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.50&r2=1.51

Patches:
Index: texi2html/test/manuals/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/manuals/tests.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- texi2html/test/manuals/tests.txt    21 Feb 2011 01:08:37 -0000      1.15
+++ texi2html/test/manuals/tests.txt    3 Apr 2011 23:07:36 -0000       1.16
@@ -13,9 +13,9 @@
 ccvs cvs.texi --split chapter --init cvs.init
 #ccvs_mediawiki cvs.texi --init mediawiki.init --split chapter
 #ccvs_mediawiki_nosplit cvs.texi --init mediawiki.init --init cvs.init
-ccvs_info cvs.texi --init info.init
+ccvs_info cvs.texi --info
 mini_ker mini_ker.texi --init book.init --split section --node-files 
--set-init-var 'USE_NODES 1' --iftex --init mini_ker_t2h.init --init tex4ht.init
-texinfo_xml texinfo.texi --init xml.init
+texinfo_xml texinfo.texi --xml
 texinfo_html texinfo.texi --html
 texinfo_html_nosplit texinfo.texi --html --no-split
 hello_html hello.texi --html

Index: tp/Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- tp/Texinfo/Convert/Info.pm  24 Mar 2011 23:06:47 -0000      1.50
+++ tp/Texinfo/Convert/Info.pm  3 Apr 2011 23:07:36 -0000       1.51
@@ -68,11 +68,12 @@
                                      'locations' => []};
   my $header = $self->_info_header();
   pop @{$self->{'count_context'}};
-  if (defined($self->{'output_dir'}) and ! -d $self->{'output_dir'}) {
-    if (!mkdir($self->{'output_dir'}, oct(755))) {
+  if (defined($self->{'destination_directory'})
+      and ! -d $self->{'destination_directory'}) {
+    if (!mkdir($self->{'destination_directory'}, oct(755))) {
       $self->document_error(sprintf($self->__(
              "Can't create directories `%s': %s"), 
-             $self->{'output_dir'}, $!));
+             $self->{'destination_directory'}, $!));
       return undef;
     }
   }