diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:26:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:26:08 +0000 |
| commit | be1becdcc1a7f171f6e5a47a83b68deab8f0e701 (patch) | |
| tree | 926753b9a3174e224a27c71051dc07c349dbde9c /odk/util | |
| parent | a7510a417d7240717cc9d3825309f8d977dafbd7 (diff) | |
INTEGRATION: CWS gcj1 (1.12.4); FILE MERGED
2005/01/10 13:22:59 cmc 1.12.4.4: #i38188# and proper check
2005/01/10 12:43:20 cmc 1.12.4.3: #i38188# rollback changes, not necessary
2004/12/03 09:43:59 cmc 1.12.4.2: #i38188# pick up on JAVADOC if necessary
2004/12/03 09:17:28 cmc 1.12.4.1: #i38188# pick up JAVADOC from settings.mk and if its not valid don't get too excited
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/check.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/odk/util/check.pl b/odk/util/check.pl index c08d2fabc587..6a23d5bf51d1 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -2,9 +2,9 @@ # # $RCSfile: check.pl,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: hr $ $Date: 2004-11-09 13:46:29 $ +# last change: $Author: obo $ $Date: 2005-01-25 15:26:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -237,7 +237,8 @@ if (-d "$StartDir") { #check java docu, it is only a first and simple check # improvement required my $solar_java = $ENV{"SOLAR_JAVA"}; - if (defined($solar_java) && $solar_java ne "") { + my $JDK = $ENV{"JDK"}; + if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { print "check java docu: "; if (-d "$StartDir/docs/java/ref") { if (! -e "$StartDir/docs/java/ref/index.html") { |