[Libreoffice-commits] .: scp2/source

[Stephan Bergmann]

 scp2/source/ooo/common_brand.scp |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 01c557cd33bcbd0e5860fcceee34ad933176e125
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 20 10:37:32 2011 +0200

    For now, keep the Mac OS X duplication of soffice.bin as soffice in installation sets.

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b639f5c..dfd577a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -522,12 +522,18 @@ End
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
+#if defined MACOSX
+    Name = "soffice.bin";
+    InstallName = "soffice";
+    Styles = (PACKED, SUBST_FILENAME);
+#else
     Name = EXENAME(soffice);
   #ifdef WNT
     Styles = (PACKED, PATCH_SO_NAME);
   #else
     Styles = (PACKED);
   #endif
+#endif
 End
 
 #if defined(UNX) && !defined(QUARTZ)