From 3af1c014c634134882638a90a2125233a794007c Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Wed, 24 Jul 2002 13:47:36 +0000
Subject: Use ${JAVA_HOME} instead of ${PREFIX}/java (they're not the same on
 Darwin). While I'm here, move the WRKSRC definition up to a more visible
 spot.

---
 net/flan/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'net/flan/Makefile')

diff --git a/net/flan/Makefile b/net/flan/Makefile
index 1dce43f3af2..d73c7ff6f62 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/24 11:59:01 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/24 13:47:36 schmonz Exp $
 #
 
 DISTNAME=	Flan
@@ -13,9 +13,13 @@ COMMENT=	Simulator for IP networks writen in Java
 USE_JAVA=	yes
 USE_GMAKE=	yes
 
+WRKSRC=		${WRKDIR}/src
+
 post-build:
-	cd ${WRKSRC} ; ${PREFIX}/java/bin/jar cf flan.jar flan/ graphic/
-	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/flan > ${WRKDIR}/flan
+	cd ${WRKSRC} ; ${JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
+	${SED} -e 's,@JAVA_HOME@,${JAVA_HOME},g'			\
+		-e 's,@PREFIX@,${PREFIX},g'				\
+		< ${FILESDIR}/flan > ${WRKDIR}/flan
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java/flan
@@ -25,6 +29,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/flan.jar ${PREFIX}/lib/java/flan
 	${INSTALL_SCRIPT} ${WRKDIR}/flan ${PREFIX}/bin
 
-WRKSRC=		${WRKDIR}/src
-
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3