From 01c557cd33bcbd0e5860fcceee34ad933176e125 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 20 Sep 2011 10:37:32 +0200
Subject: For now, keep the Mac OS X duplication of soffice.bin as soffice in
 installation sets.

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

(limited to 'scp2')

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b639f5cf97dc..dfd577a1d873 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)
-- 
cgit