texinfo/tp/Texinfo/Convert Converter.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/09/15 11:45:32

Modified files:
        tp/Texinfo/Convert: Converter.pm 

Log message:
        Use setfilename if found through get_conf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.89&r2=1.90

Patches:
Index: Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- Converter.pm        14 Sep 2012 20:20:07 -0000      1.89
+++ Converter.pm        15 Sep 2012 11:45:32 -0000      1.90
@@ -440,10 +440,13 @@
   $input_basename =~ s/\.te?x(i|info)?$//;
 
   my $setfilename;
-  $setfilename = $self->{'extra'}->{'setfilename'}->{'extra'}->{'text_arg'}
-    if ($self->{'extra'} and $self->{'extra'}->{'setfilename'}
+  if (defined($self->get_conf('setfilename'))) {
+    $setfilename = $self->get_conf('setfilename');
+  } elsif ($self->{'extra'} and $self->{'extra'}->{'setfilename'}
         and $self->{'extra'}->{'setfilename'}->{'extra'}
-        and 
defined($self->{'extra'}->{'setfilename'}->{'extra'}->{'text_arg'}));
+          and 
defined($self->{'extra'}->{'setfilename'}->{'extra'}->{'text_arg'})) {
+     $setfilename = $self->{'extra'}->{'setfilename'}->{'extra'}->{'text_arg'}
+  }
 
   # PREFIX overrides both setfilename and the input file base name
   if (defined($self->get_conf('PREFIX'))) {