diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:28:42 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:28:42 +0000 |
commit | 7ebc1e69c3a69186bceefda9a58ea40c502a750f (patch) | |
tree | a304b94207e33ff85990ad24773601b837c33976 /jvmfwk/distributions | |
parent | INTEGRATION: CWS freebsd04 (1.6.22); FILE MERGED (diff) | |
download | core-7ebc1e69c3a69186bceefda9a58ea40c502a750f.tar.gz core-7ebc1e69c3a69186bceefda9a58ea40c502a750f.zip |
INTEGRATION: CWS freebsd04 (1.4.18); FILE MERGED
2006/01/19 11:14:14 maho 1.4.18.1: #i56951#
javavendors_linux.xml can be used for FreeBSD as well
Diffstat (limited to 'jvmfwk/distributions')
-rwxr-xr-x | jvmfwk/distributions/OpenOfficeorg/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index 8c86a9d880b0..88f4c4e512f2 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-07 19:26:17 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:28:42 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,7 @@ $(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" +-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml -.ELIF "$(OS)"=="LINUX" +.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" +-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml .ELSE +-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml |