[Libreoffice-commits] .: scp2/source

[Michael Meeks]

 scp2/source/ooo/common_brand.scp |    4 ++++
 scp2/source/ooo/file_ooo.scp     |   20 ++------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit 40eec05c38b622940b818a49b592158d85daf7e3
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 22 10:06:38 2011 +0000

    disable pagein and oosplash.bin compile/install for Mac

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e70da01..3bf0366 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -514,6 +514,8 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
+#if defined UNX && ! defined MACOSX
+
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -521,6 +523,8 @@ File gid_File_Bin_QStart_Bin
     Name = "oosplash.bin";
 End
 
+#endif
+
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 035ab2c..65769d2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,7 +108,7 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_Pagein
     BIN_FILE_BODY;
@@ -1286,7 +1286,7 @@ End
 
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Txt_Pagein_Calc
     TXT_FILE_BODY;
@@ -1295,10 +1295,6 @@ File gid_File_Txt_Pagein_Calc
     Name = "pagein-calc";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Common
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1306,10 +1302,6 @@ File gid_File_Txt_Pagein_Common
     Name = "pagein-common";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Draw
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1317,10 +1309,6 @@ File gid_File_Txt_Pagein_Draw
     Name = "pagein-draw";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Impress
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1328,10 +1316,6 @@ File gid_File_Txt_Pagein_Impress
     Name = "pagein-impress";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Writer
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;