[Libreoffice-commits] .: desktop/source desktop/unx

[Michael Meeks]

 desktop/source/pagein/makefile.mk |    9 +++++++++
 desktop/unx/splash/makefile.mk    |    7 +++++++
 2 files changed, 16 insertions(+)

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

    disable pagein and oosplash.bin compile/install for Mac

diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 205e03c..2b02a4d 100755
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -41,6 +41,13 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE .IGNORE : icuversion.mk
 
+.IF "$(OS)"=="MACOSX"
+
+dummy:
+    @echo "Pagein disabled for mac"
+
+.ELSE
+
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
@@ -185,3 +192,5 @@ $(MISC)$/$(TARGET)-common : makefile.mk
 # stoc bits
     @-echo $(DLLPRE)sfx$(DFTDLLPOST)             >> $@
     @-echo $(DLLPRE)sofficeapp$(DLLPOST)         >> $@
+
+.ENDIF
\ No newline at end of file
diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
index 23a9d98..e338cfe 100755
--- a/desktop/unx/splash/makefile.mk
+++ b/desktop/unx/splash/makefile.mk
@@ -36,6 +36,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)"=="MACOSX"
+dummy:
+    @echo "Unix quickstarter disabled for mac"
+.ELSE
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =  $(SLO)$/unxsplash.obj
@@ -67,3 +72,5 @@ $(MISC)/splash.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt splash.component
+
+.ENDIF
\ No newline at end of file