Show
Ignore:
Timestamp:
30.06.2010 15:38:16 (10 years ago)
Author:
sjm84
Message:

Fixed a few errors in the separation of Apache from the rest of Greenstone in the installation

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r22325 r22333  
    175175 
    176176      <!-- if linux|mac --> 
    177       <sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/imagemagick.comp"/> 
     177      <sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/apachehttpd.comp"/> 
    178178      <!-- /if --> 
    179179      <!-- if windows --> 
     
    182182      </exec> 
    183183      <!-- /if --> 
     184      <unzip src="${basedir}/apachehttpd.comp" dest="${installDir}"/> 
     185      <delete file="apachehttpd.comp"/> 
    184186      <!-- end web --> 
    185187 
     
    208210        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if --> 
    209211        <delete file="imagemagick.lzma"/> 
    210         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/${rk.os}"/> 
     212        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}"/> 
    211213        <delete file="imagemagick.comp"/> 
    212214        <!-- end web --> 
     
    230232        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if --> 
    231233        <delete file="ghostscript.lzma"/> 
    232         <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/${rk.os}" /> 
     234        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}" /> 
    233235        <delete file="ghostscript.comp"/> 
    234236        <!-- end web -->