cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put JAVA_HOME in SUBST_VARS

Browse Source
This commit is contained in:
jasper 2011-09-19 20:03:20 +00:00
parent 77233f59d9
commit c3fe8f6e32
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/intellij/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2011/09/16 09:24:51 espie Exp $
# $OpenBSD: Makefile,v 1.14 2011/09/19 20:03:20 jasper Exp $
SHARED_ONLY= Yes
@ -31,7 +31,6 @@ BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
RUN_DEPENDS= devel/desktop-file-utils
NO_REGRESS= Yes
SUBST_VARS+= JAVA_HOME
WRKDIST= ${WRKDIR}/idea-IC-95.627
IJ= ${PREFIX}/intellij

6
devel/jdk/java.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.26 2011/09/01 17:13:51 jasper Exp $
# $OpenBSD: java.port.mk,v 1.27 2011/09/19 20:03:20 jasper Exp $
# Set MODJAVA_VER to x.y or x.y+ based on the version
# of the jdk needed for the port. x.y means any x.y jdk.
@ -98,6 +98,10 @@ MODJAVA_JRERUN?=no
ERRORS+="Fatal: MODJAVA_VER must be set to a valid value."
.endif
.if defined(JAVA_HOME)
SUBST_VARS += JAVA_HOME
.endif
RUN_DEPENDS+= ${MODJAVA_RUN_DEPENDS}
# Append 'java' to the list of categories.