Changeset 24606

Show
Ignore:
Timestamp:
16.09.2011 15:29:47 (8 years ago)
Author:
ak19
Message:

Part of commit 24600: I didn't know env var GSDLARCH wasn't compulsory on Windows (where it isn't set by running setup.bat)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/gs-magick.pl

    r24601 r24606  
    3737    die "GSDLHOME not set - run the (gs3-)setup script\n" unless defined $ENV{'GSDLHOME'}; 
    3838    die "GSDLOS not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLOS'}; 
    39     die "GSDLARCH not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLARCH'}; 
    40  
     39    if($ENV{'GSDLOS'} =~ m/windows/) { # windows doesn't (yet) define GSDLARCH env var 
     40        $ENV{'GSDLARCH'} = "" unless defined $ENV{'GSDLARCH'}; 
     41    } 
     42    die "GSDLARCH not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLARCH'}; 
    4143    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    4244}