diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-02 18:04:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-02 18:04:48 +0000 |
| commit | 6989e7a043e210e423d5d0252d903c71166a1096 (patch) | |
| tree | 1daeefc8a8769b4f513377b7da4c010b92922c2d /mk | |
| parent | 594c02995d31c710aeac48add9737eee99ea50db (diff) | |
| download | pkgsrc-6989e7a043e210e423d5d0252d903c71166a1096.tar.gz | |
Automatically substitute for JAVA_HOME and PKG_JAVA_HOME in PLISTs.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-env.mk | 5 | ||||
| -rw-r--r-- | mk/java-vm.mk | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/java-env.mk b/mk/java-env.mk index e4c9e2d59e1..830d28fbbd6 100644 --- a/mk/java-env.mk +++ b/mk/java-env.mk @@ -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 @@ install-java-wrapper-${w}: 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 --git a/mk/java-vm.mk b/mk/java-vm.mk index 4113a576ff4..633732336b4 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -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 @@ MAKEFLAGS+= PKG_JVM=${PKG_JVM:Q} 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 |