diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-08-25 13:47:19 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-08-25 13:47:19 +0000 |
| commit | c597690b08fe43e5f4630a5d3258d37a34f09106 (patch) | |
| tree | eb093faa49216fb4157bc393439b4dc1cda688f1 /solenv/inc/tg_javav.mk | |
| parent | a6d4e9baef6fc082ceb60290ef9aa88c7036c962 (diff) | |
INTEGRATION: CWS ause04 (1.4.10); FILE MERGED
2003/06/26 16:39:30 hjs 1.4.10.1: #110050# - fix javaver.mk generation
Diffstat (limited to 'solenv/inc/tg_javav.mk')
| -rw-r--r-- | solenv/inc/tg_javav.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk index fb3c47432..0705cab9d 100644 --- a/solenv/inc/tg_javav.mk +++ b/solenv/inc/tg_javav.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_javav.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2003-06-04 10:40:35 $ +# last change: $Author: kz $ $Date: 2003-08-25 14:47:19 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,7 +64,7 @@ JAVAVERMK:=$(INCCOM)$/java_ver.mk .INCLUDE .IGNORE : $(JAVAVERMK) -.IF "$(JAVAVER)"=="" +.IF "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)" .IF "$(L10N_framework)"=="" JAVAVER:= @@ -83,4 +83,4 @@ JAVAVER:=$(shell -$(JAVA_HOME)$/bin$/java $(JFLAGSVERSION_CMD)) JAVANUMVER:=$(shell -$(JAVA_HOME)$/bin$/java $(JFLAGSNUMVERSION_CMD)) .ENDIF # "$(L10N_framework)"=="" -.ENDIF # "$(COMNAME)"=="" +.ENDIF # "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)" |