Changeset 29078 for main

Show
Ignore:
Timestamp:
26.05.2014 11:37:09 (6 years ago)
Author:
kjdon
Message:

make builddir absolute if it isn't already (so you can say -builddir building1 for example). Needed to use self->builddir not $builddir as the latter was empty, so I have changed the make absolute for archivesdir in the same way

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/buildcolutils.pm

    r28801 r29078  
    275275  else 
    276276  { 
    277     $self->{'archivedir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir); 
     277    $self->{'archivedir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $self->{'archivedir'}); 
    278278  } 
    279279  # End Mod 
     
    294294      &gsprintf::gsprintf($out, "{buildcol.incremental_default_builddir}\n"); 
    295295    } 
    296   } 
     296  } else { 
     297      # make absolute if not already 
     298      $self->{'builddir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $self->{'builddir'}); 
     299  } 
     300   
    297301  # - why don't we make builddir absolute similar to archivedir? 
    298302  $self->{'builddir'} = &FileUtils::sanitizePath($self->{'builddir'});