From 5319808d29666827df2b6010b433c293cf738b4e Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Fri, 8 Feb 2013 16:31:44 +0100
Subject: Package the right pixman and cairo

Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
---
 scp2/source/ooo/file_library_ooo.scp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scp2')

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ef16c9450131..f6699e650ac6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,7 +560,7 @@ File gid_File_Lib_Cairo
     #ifdef MACOSX
        Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT2(libcairo,UNXSUFFIX));
+       Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
     #endif
   #elif defined(WNT)
     #ifdef _gcc3
@@ -578,7 +578,11 @@ File gid_File_Lib_Pixman
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
+    #ifdef MACOSX
        Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
   #endif
 End
 
-- 
cgit