[pkgsrc/trunk]: pkgsrc/mk Automatically substitute for JAVA_HOME and PKG_JAVA...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b8935ec670f
branches:  trunk
changeset: 531602:1b8935ec670f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 02 18:04:48 2007 +0000

description:
Automatically substitute for JAVA_HOME and PKG_JAVA_HOME in PLISTs.

diffstat:

 mk/java-env.mk |  5 ++++-
 mk/java-vm.mk  |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r ba0b2f7741f0 -r 1b8935ec670f mk/java-env.mk
--- a/mk/java-env.mk    Thu Aug 02 17:55:17 2007 +0000
+++ b/mk/java-env.mk    Thu Aug 02 18:04:48 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-env.mk,v 1.9 2007/02/18 16:25:54 tv Exp $
+# $NetBSD: java-env.mk,v 1.10 2007/08/02 18:04:48 jlam Exp $
 #
 # This Makefile fragment handles Java wrappers and is meant to be included
 # by packages that provide a Java build-time and/or run-time environment.
@@ -94,4 +94,7 @@
 REQD_DIRS+=            ${PREFIX}/java
 PRINT_PLIST_AWK+=      /^@dirrm java$$/ { next; }
 
+PLIST_SUBST+=          JAVA_HOME=${JAVA_HOME:Q}
+FILES_SUBST+=          JAVA_HOME=${JAVA_HOME:Q}
+
 .endif # JAVA_ENV_MK
diff -r ba0b2f7741f0 -r 1b8935ec670f mk/java-vm.mk
--- a/mk/java-vm.mk     Thu Aug 02 17:55:17 2007 +0000
+++ b/mk/java-vm.mk     Thu Aug 02 18:04:48 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.59 2007/06/11 07:03:18 abs Exp $
+# $NetBSD: java-vm.mk,v 1.60 2007/08/02 18:04:49 jlam Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -386,4 +386,7 @@
 PREPEND_PATH+=         ${PKG_JAVA_HOME}/bin
 JAVA_BINPREFIX=                ${LOCALBASE}/bin/${_JAVA_NAME.${_PKG_JVM}}
 
+PLIST_SUBST+=          PKG_JAVA_HOME=${PKG_JAVA_HOME:Q}
+FILES_SUBST+=          PKG_JAVA_HOME=${PKG_JAVA_HOME:Q}
+
 .endif # JAVA_VM_MK