inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1)

Browse Source 
126145 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126143 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.
            - This commit will be merged to all HF branches so that it will be included in all future HFs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-05-05 15:43:36 +00:00
parent cb460acb55
commit 72a23f814e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/bitrock/imagemagick.xml
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"/>