diff options
| author | znerd <znerd@FreeBSD.org> | 2003-12-15 07:04:50 +0000 |
|---|---|---|
| committer | znerd <znerd@FreeBSD.org> | 2003-12-15 07:04:50 +0000 |
| commit | f658f4fb78571c527caa0e21f2c2cc79690af9ff (patch) | |
| tree | f2aef4f4e6a5aee58b13094f8b4db7d4891a42f4 /Mk/bsd.java.mk | |
| parent | eb8a9a2a13694537d7e28fc54e893d104ada892f (diff) | |
| download | FreeBSD-ports-f658f4fb78571c527caa0e21f2c2cc79690af9ff.zip FreeBSD-ports-f658f4fb78571c527caa0e21f2c2cc79690af9ff.tar.gz | |
Fixed bug. If a Linux 1.4 JDK would have been installed, it
would not have been picked up if USE_JAVA was set to "1.3+".
The behaviour is now as follows if USE_JAVA is set to
"1.3+":
- If the setting is 1.3+, then use an already installed 1.3
or 1.4 JDK. If there is no such JDK, then set USE_JAVA to
1.3. The FreeBSD JDK 1.4 is preferred over all other
JDK's.
Noticed by: pav
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 8df6def..76e181e 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -204,7 +204,7 @@ JAVA_HOME= ${_JAVA_HOME} # # If the setting is 1.3+, then use an already installed 1.3 or 1.4 JDK. If # there is no such JDK, then set USE_JAVA to 1.3. The FreeBSD JDK 1.4 is -# preferred over 1.3 JDK's. +# preferred over all other JDK's. # # If the setting is 1.4+, then set it to 1.4 right away. There is no other # option at the moment. @@ -254,11 +254,14 @@ USE_JAVA= 1.4 defined(HAVE_JAVA_FREEBSD_1_3) || \ defined(HAVE_JAVA_SUN_LINUX_1_3) || \ defined(HAVE_JAVA_IBM_LINUX_1_3) || \ - defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ - !defined(HAVE_JAVA_SUN_LINUX_1_4) + defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) USE_JAVA= 1.3 -. else +. elif defined(HAVE_JAVA_SUN_LINUX_1_4) || \ + defined(HAVE_JAVA_IBM_LINUX_1_4) || \ + defined(HAVE_JAVA_BLACKDOWN_LINUX_1_4) USE_JAVA= 1.4 +. else +USE_JAVA= 1.3 . endif . elif (${USE_JAVA} == "1.4+") |
