diff options
| author | jlam <jlam@pkgsrc.org> | 2002-10-10 01:01:09 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-10-10 01:01:09 +0000 |
| commit | 04c8f5b9963d6664e09bf289d6a81be56cf7e85c (patch) | |
| tree | 2399291c226930979154ddf72cdfd8db4723ce29 /net | |
| parent | 2fee5c042a5114edb3367d40be252acbe34b6dec (diff) | |
| download | pkgsrc-04c8f5b9963d6664e09bf289d6a81be56cf7e85c.tar.gz | |
Use PKG_JAVA_HOME consistently instead of JAVA_HOME now that JAVA_HOME is
no longer defined by bsd.pkg.mk.
Diffstat (limited to 'net')
| -rw-r--r-- | net/airportbasestationconfig/Makefile | 4 | ||||
| -rw-r--r-- | net/flan/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index ca4f6ff9be5..ff1043a2613 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/09/08 06:19:00 tron Exp $ +# $NetBSD: Makefile,v 1.17 2002/10/10 01:01:11 jlam Exp $ DISTNAME= configurator_152-128 PKGNAME= ${BINNAME}-1.5.2 @@ -44,7 +44,7 @@ post-extract: do-build: ${ECHO} "#!/bin/sh" >${WRKSRC}/${BINNAME} - ${ECHO} "PATH=${JAVA_HOME}/bin:\$${PATH}; export PATH" >>${WRKSRC}/${BINNAME} + ${ECHO} "PATH=${PKG_JAVA_HOME}/bin:\$${PATH}; export PATH" >>${WRKSRC}/${BINNAME} .if defined(CLASSPATH) ${ECHO} "CLASSPATH=${CLASSPATH}:\$${CLASSPATH}; export CLASSPATH" >>${WRKSRC}/${BINNAME} .endif diff --git a/net/flan/Makefile b/net/flan/Makefile index 97a1363fe2b..7c6eea5db26 100644 --- a/net/flan/Makefile +++ b/net/flan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/07 14:32:37 agc Exp $ +# $NetBSD: Makefile,v 1.4 2002/10/10 01:01:11 jlam Exp $ # DISTNAME= Flan @@ -17,8 +17,8 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/src post-build: - cd ${WRKSRC} ; ${JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/ - ${SED} -e 's,@JAVA_HOME@,${JAVA_HOME},g' \ + cd ${WRKSRC} ; ${PKG_JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/ + ${SED} -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' \ -e 's,@PREFIX@,${PREFIX},g' \ < ${FILESDIR}/flan > ${WRKDIR}/flan |