- Timestamp:
- 2018-06-26T15:57:25+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/gsConvert.pl
r32220 r32221 848 848 my $xpdf_pdftohtml = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools"); 849 849 850 if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit 851 $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 852 #} elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) { 853 # TODO 850 if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit 851 $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 854 852 } else { # unix (linux|darwin), use the bin32/bin64 folder depending on the BITNESS env var 855 853 856 857 858 859 860 861 862 863 864 865 854 # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since 855 # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit 856 # specific subdirectories exist in a greenstone installation. 857 # None of those locations need exist when xpdf-tools is installed with GS. 858 # So don't depend on GSDLARCH as forcing that to be exported has side-effects 859 if($ENV{'BITNESS'}) { 860 $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'}); 861 } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64? 862 $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 863 } 866 864 } 867 865
Note:
See TracChangeset
for help on using the changeset viewer.