summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-02-08 16:31:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-02-08 15:54:56 +0000
commit662f0c0d4f07927534359a17055ffaa78508c8bc (patch)
tree837a493a5dc15f93ab279c155e170d20f690037e /scp2
parent94e914ccd5c634bcc878453da3a7f388d42fd224 (diff)
Package the right pixman and cairo
Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608 Reviewed-on: https://gerrit.libreoffice.org/2051 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 86dde44a28b1..642cd81504df 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