Revision 496

Date:
2015/05/26 19:47:15
Author:
ahitrov
Revision Log:
Experimanetal: installer doesn't install ImageMagick if global 'convert' binary available

Files:

Legend:

 
Added
 
Removed
 
Modified

  • utf8/core/config.mk

     
    20 20 CORE_REQUIRED += HTML-Mason
    21 21 CORE_REQUIRED += apache13
    22 22 CORE_REQUIRED += libapreq
    23 CORE_REQUIRED += ImageMagick
    24 23 CORE_REQUIRED += IO-stringy
    25 24 CORE_REQUIRED += DateTime-Format-Pg
    26 25 CORE_REQUIRED += Cache-Memcached-Fast
    … …  
    52 51 DEVELOPMENT ?= NO
    53 52
    54 53 OPTIONS_EXPIRE ?= 600
    54
    55 CONVERT = ${shell export PATH=${LOCAL}/bin:$${PATH}; which convert}
    56 ifeq (${CONVERT},)
    57 CORE_REQUIRED += ImageMagick
    58 endif

  • utf8/core/project-default.mk

     
    207 207 fi;}
    208 208
    209 209 COMPOSITE = ${shell export PATH=${LOCAL}/bin:$${PATH}; which composite}
    210 CONVERT = ${shell export PATH=${LOCAL}/bin:$${PATH}; which convert}
    211 ifeq (${CONVERT},)
    212 ${error ERROR: No executable convert found, you need to install ImageMagick first}
    213 endif
    210 #CONVERT = ${shell export PATH=${LOCAL}/bin:$${PATH}; which convert}
    211 #ifeq (${CONVERT},)
    212 #${error ERROR: No executable convert found, you need to install ImageMagick first}
    213 #endif