diff options
| author | jmmv <jmmv> | 2004-05-22 21:22:59 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-05-22 21:22:59 +0000 |
| commit | 7d63c215eca808e99854de31d9851c7e69ca4b15 (patch) | |
| tree | fb4ae96e5589c88385f46f8080663feefc71c784 /lang/sun-jre13/Makefile.common | |
| parent | 78f3c3429164a9717e6df603a93a779b5028c62c (diff) | |
| download | pkgsrc-7d63c215eca808e99854de31d9851c7e69ca4b15.tar.gz | |
Convert sun-{jre,jdk}13 to use java-env.mk. This implies that the
package now install several wrappers under ${PREFIX}/bin to run the
binaries installed under ${JAVA_HOME}/bin easily. While here, drop
the direct modification of PREFIX. No revision bump since these
packages were updated just some minutes ago.
Diffstat (limited to 'lang/sun-jre13/Makefile.common')
| -rw-r--r-- | lang/sun-jre13/Makefile.common | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index f8c0e66544d..ab01fd9a6ba 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2004/05/05 17:22:51 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.21 2004/05/22 21:22:59 jmmv Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang java @@ -23,9 +23,10 @@ INTERACTIVE_STAGE= fetch .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" -JVM_HOME= /usr +JAVA_HOME= /usr .else -JVM_HOME= ${LOCALBASE}/java/sun-1.3.1 +JAVA_HOME= ${LOCALBASE}/java/sun-1.3.1 +JAVA_NAME= sun13 .endif .if ${OPSYS} == "NetBSD" @@ -86,14 +87,13 @@ do-install: @${ECHO_MSG} "Darwin ships with a JRE/JDK based on Sun's 1.3.1 release." .else do-install: - ${INSTALL_PROGRAM_DIR} ${PREFIX} - cd ${WRKSRC} && ${PAX} -rwp ma . ${PREFIX} + ${INSTALL_PROGRAM_DIR} ${JAVA_HOME} + cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME} .endif .if ${OPSYS} == "NetBSD" . include "../../emulators/suse_linux/Makefile.application" .endif +.include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" - -PREFIX= ${JVM_HOME} |