Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

126145 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126143 jphuynh: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126147 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2016-05-05 14:36:33 +00:00
parent db9e184025
commit 79596fa59a

View File

@@ -290,7 +290,7 @@ export GS_LIB
<platformTest type="unix"/>
</conditionRuleList>
<actionList>
<setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config/policy.xml"/>
<setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/policy.xml"/>
</actionList>
<elseActionList>
<setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/policy.xml"/>