summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-29 09:28:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-29 09:28:20 +0000
commit7c0c158177c113ed8954eafb8f250d1ea01b6061 (patch)
tree34c6afbd8c9ca948869642f042d1c5644afe9c90
parent84ef2d0f72207a00ca832e3054ff42349188342f (diff)
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
-rw-r--r--desktop/scripts/makefile.mk7
1 files 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