diff options
| -rw-r--r-- | lang/Makefile | 4 | ||||
| -rw-r--r-- | mk/java-vm.mk | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/Makefile b/lang/Makefile index 6e44f8d9c1f..b90c7cedc3e 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2004/07/23 02:05:45 minskim Exp $ +# $NetBSD: Makefile,v 1.185 2004/07/28 21:15:38 tv Exp $ # COMMENT= Programming languages @@ -70,6 +70,8 @@ SUBDIR+= java-wrapper SUBDIR+= jbuilder-jit SUBDIR+= jdk SUBDIR+= jdk-openjit +SUBDIR+= jdk12 +SUBDIR+= jdk12-openjit SUBDIR+= jikes SUBDIR+= jini SUBDIR+= joos diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 39f92ffc55a..5d5e1ad3304 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.30 2004/07/14 13:37:09 wiz Exp $ +# $NetBSD: java-vm.mk,v 1.31 2004/07/28 21:15:38 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -81,7 +81,7 @@ _PKG_JVM_DEFAULT?= kaffe _ONLY_FOR_PLATFORMS.jdk= \ NetBSD-*-i386 Linux-*-i[3-6]86 _ONLY_FOR_PLATFORMS.jdk12= \ - NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 + NetBSD-1.[4-9]*-i386 NetBSD-[2-9].*-i386 _ONLY_FOR_PLATFORMS.jdk13= \ NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 _ONLY_FOR_PLATFORMS.jdk14= \ @@ -221,7 +221,7 @@ _JDK_PKGSRCDIR= ../../lang/jdk _JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} _JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.1.8 .elif ${_PKG_JVM} == "jdk12" -_JDK_PKGSRCDIR= ../../wip/jdk12 +_JDK_PKGSRCDIR= ../../lang/jdk12 _JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} _JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.2.2 .elif ${_PKG_JVM} == "jdk13" |