From 01ed5103c574262963fca4cbd24f068cea829aed Mon Sep 17 00:00:00 2001
From: Herve Quiroz <hq@FreeBSD.org>
Date: Sat, 23 Apr 2005 10:51:59 +0000
Subject: Use JAVALIBDIR to find JAR dependencies during the build

PR:		80271
Submitted by:	maintainer
---
 databases/mysql-connector-java50/Makefile              | 2 +-
 databases/mysql-connector-java50/files/patch-build.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'databases/mysql-connector-java50')

diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile
index 500521cb732d..ad2e1cf7ab4c 100644
--- a/databases/mysql-connector-java50/Makefile
+++ b/databases/mysql-connector-java50/Makefile
@@ -25,7 +25,7 @@ USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.4+
 ALL_TARGET=	clean compile-driver
-MAKE_ARGS=	-Djavajardir=${JAVAJARDIR}
+MAKE_ARGS=	-Djavalibdir=${JAVALIBDIR}
 BUILDDIR=	${WRKDIR}/build-mysql-jdbc/${DISTNAME}
 
 .else
diff --git a/databases/mysql-connector-java50/files/patch-build.xml b/databases/mysql-connector-java50/files/patch-build.xml
index 336e6a836c94..51cac6676245 100644
--- a/databases/mysql-connector-java50/files/patch-build.xml
+++ b/databases/mysql-connector-java50/files/patch-build.xml
@@ -4,7 +4,7 @@
  			<include name="**/*.jar"/>
  		</fileset>
  
-+		<fileset dir="${javajardir}">
++		<fileset dir="${javalibdir}">
 +			<include name="junit.jar"/>
 +			<include name="log4j.jar"/>
 +		</fileset>
-- 
cgit v1.2.3