diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:20:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:20:25 +0000 |
| commit | d235a7673a90fb28662232da02899f18a82629cc (patch) | |
| tree | 90f99e0c7484ebd0c658ea730ce04a8c6171de0c /jvmfwk/distributions | |
| parent | 70ed307db7c14f1700effb3a7ecc3430bcd8a6b7 (diff) | |
INTEGRATION: CWS sb83 (1.7.16); FILE MERGED
2008/02/14 15:38:18 sb 1.7.16.1: #i84200# use standard OOo javavendors.xml for StarOffice, too
Diffstat (limited to 'jvmfwk/distributions')
| -rwxr-xr-x | jvmfwk/distributions/OpenOfficeorg/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index aec13e4c7f40..153e1067524a 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hr $ $Date: 2007-11-02 12:26:51 $ +# last change: $Author: vg $ $Date: 2008-03-18 12:20:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,19 +45,19 @@ nojava: .ENDIF .IF "$(SOLAR_JAVA)"!="" -$(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml +$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml + -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml .ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - -$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml + -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml .ELSE - -$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml + -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml .ENDIF .ELIF "$(GUI)"=="WNT" - -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors_ooo.xml + -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml .ELIF "$(GUI)"=="OS2" - -$(COPY) javavendors_os2.xml $(BIN)$/javavendors_ooo.xml + -$(COPY) javavendors_os2.xml $(BIN)$/javavendors.xml .ELSE @echo Unsupported platform. .ENDIF |