diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:59:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:59:40 +0000 |
| commit | c7576cdffa1a1853770a01cbee2cf171e41f9f3a (patch) | |
| tree | 49fdaf66b1c146a6e9f078bf1b3e77ceb77cf483 /filter/source/config/tools/merge | |
| parent | 3076f5a99ce9702f5f57fa4bcacc6d9c52b4de62 (diff) | |
INTEGRATION: CWS os2port01 (1.6.98); FILE MERGED
2007/08/07 15:26:18 obr 1.6.98.2: RESYNC: (1.6-1.7); FILE MERGED
2006/12/28 14:55:51 ydario 1.6.98.1: OS/2 initial import.
Diffstat (limited to 'filter/source/config/tools/merge')
| -rw-r--r-- | filter/source/config/tools/merge/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/config/tools/merge/makefile.mk b/filter/source/config/tools/merge/makefile.mk index f92ca3d49e15..e1542dd3557e 100644 --- a/filter/source/config/tools/merge/makefile.mk +++ b/filter/source/config/tools/merge/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2007-01-25 12:47:16 $ +# last change: $Author: vg $ $Date: 2007-09-20 14:59:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ JARCOMPRESS = TRUE .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" || "$(GUI)"=="OS2" ALLTAR : $(OWNCOPY) .IF "$(JARTARGETN)" != "" |