diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-29 09:28:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-29 09:28:20 +0000 |
| commit | 79819c2f2697b228f7d20ca377c9afcd8744729c (patch) | |
| tree | 3517d9cc4608fd85355e02420ce0031a07a1fd1d /desktop | |
| parent | 4e46570db19a765f76e8ca7458173d899186c780 (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
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk index ec28dfcd53ef..52750ca0b44f 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 |