diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 12:31:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 12:31:15 +0000 |
| commit | 6bb4f43fb82d129a8b1746888b388428e784a4bc (patch) | |
| tree | f669894660414545c9f54f7aa149e4032a1005aa /solenv/inc/settings.mk | |
| parent | d854d19d42542ec4627f45873c57ad9d3d2aedc4 (diff) | |
INTEGRATION: CWS complextest1 (1.215.14); FILE MERGED
2007/06/21 14:38:16 cn 1.215.14.1: #i78349# modifications to run checkapi in new dmake environment
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index d80912494021..74deb15fd7f8 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.218 $ +# $Revision: 1.219 $ # -# last change: $Author: rt $ $Date: 2007-07-10 09:21:45 $ +# last change: $Author: rt $ $Date: 2007-07-24 13:31:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -156,7 +156,7 @@ JAVADOC=javadoc -J-Xmx120m #required arguments JAVAC=$(JAVACOMPILER) -JAVAI=$(JAVAINTERPRETER) +JAVAI:=$(JAVAINTERPRETER) .IF "$(JAVACISGCJ)" == "yes" JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C .ENDIF @@ -982,10 +982,12 @@ CPPUMAKER*=$(WRAPCMD) cppumaker JAVAMAKER*=$(WRAPCMD) javamaker RDBMAKER*=$(WRAPCMD) rdbmaker .IF "$(JAVAINTERPRETER)" == "" -JAVA*=java +JAVA*:=java .ELSE -JAVA*=$(JAVAINTERPRETER) +JAVA*:=$(JAVAINTERPRETER) .ENDIF +.EXPORT : JAVA JAVAI + # Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style # pathes. (See iz57443) SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl |