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

add MODJAVA_*_DIR to SUBST_VARS.

Browse Source 
ok kurt@
This commit is contained in:
jasper 2013-02-03 15:03:03 +00:00
parent d38af15ac6
commit 60ebf34b3b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.30 2011/12/15 21:31:29 kili Exp $
# $OpenBSD: java.port.mk,v 1.31 2013/02/03 15:03:03 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.
@ -104,7 +104,7 @@ do-build:
${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant \
-buildfile ${MODJAVA_BUILD_FILE} ${MODJAVA_BUILD_TARGET} \
${MODJAVA_BUILD_ARGS}
. endif
. endif
.endif
# Convenience variables.
@ -116,3 +116,6 @@ MODJAVA_SHARE_DIR = ${PREFIX}/share/java/
MODJAVA_JAR_DIR = ${MODJAVA_SHARE_DIR}/classes/
MODJAVA_EXAMPLE_DIR = ${MODJAVA_SHARE_DIR}/examples/
MODJAVA_DOC_DIR = ${MODJAVA_SHARE_DIR}/doc/
SUBST_VARS += MODJAVA_SHARE_DIR MODJAVA_JAR_DIR MODJAVA_EXAMPLE_DIR \
MODJAVA_DOC_DIR

4
devel/leiningen/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2011/11/29 17:42:17 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2013/02/03 15:03:03 jasper Exp $
COMMENT= tool for building of code, written in Clojure
@ -30,8 +30,6 @@ RUN_DEPENDS= devel/apache-ant \
java/javaPathHelper \
shells/bash
SUBST_VARS+= MODJAVA_JAR_DIR
do-configure:
${SUBST_CMD} ${WRKSRC}/lein-pkg