summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql-connector-java/Makefile2
-rw-r--r--databases/mysql-connector-java/files/patch-build.xml2
-rw-r--r--databases/mysql-connector-java50/Makefile2
-rw-r--r--databases/mysql-connector-java50/files/patch-build.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 500521cb732d..ad2e1cf7ab4c 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/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-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml
index 336e6a836c94..51cac6676245 100644
--- a/databases/mysql-connector-java/files/patch-build.xml
+++ b/databases/mysql-connector-java/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>
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>