From 7c0c158177c113ed8954eafb8f250d1ea01b6061 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 29 Aug 2008 09:28:20 +0000 Subject: INTEGRATION: CWS macrestart_DEV300 (1.14.90); FILE MERGED 2008/08/22 21:36:46 hro 1.14.90.1: #i92798# Fixed concurrency between soffice.sh and officeloader delivering --- desktop/scripts/makefile.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk index ec28dfcd53..52750ca0b4 100644 --- a/desktop/scripts/makefile.mk +++ b/desktop/scripts/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # # This file is part of OpenOffice.org. # @@ -42,7 +42,6 @@ TARGET=scripts UNIXTEXT= \ $(MISC)$/sbase.sh \ - $(MISC)$/soffice.sh \ $(MISC)$/scalc.sh \ $(MISC)$/sdraw.sh \ $(MISC)$/simpress.sh \ @@ -54,4 +53,8 @@ UNIXTEXT= \ $(MISC)$/unoinfo.sh \ $(MISC)$/unopkg.sh +.IF "$(OS)" != "MACOSX" +UNIXTEXT+= $(MISC)$/soffice.sh +.ENDIF + .INCLUDE : target.mk -- cgit v1.2.3