summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-08-02 17:55:17 +0000
committerjlam <jlam@pkgsrc.org>2007-08-02 17:55:17 +0000
commit594c02995d31c710aeac48add9737eee99ea50db (patch)
treea95f2661d5a20174b549251c1509369104ec7b8b /lang
parent491f6d7088e4c7e382dd4c7a8846b88f568c8be3 (diff)
downloadpkgsrc-594c02995d31c710aeac48add9737eee99ea50db.tar.gz
Skip the check for the right file -- the installed file is under
${EMUL_ARCH}, not ${MACHINE_ARCH}.
Diffstat (limited to 'lang')
-rw-r--r--lang/sun-jre15/Makefile4
-rw-r--r--lang/sun-jre6/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 450a9c53e4d..763ddb6351e 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/07/29 05:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2007/08/02 17:55:17 jlam Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -27,7 +27,7 @@ CONF_FILES= # empty
CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
-CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre15
PKG_SUPPORTED_OPTIONS= sun-jre-jce
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 1d826c95136..23a492b696b 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/07/29 05:19:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/02 17:55:17 jlam Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -28,7 +28,7 @@ CONF_FILES= # empty
CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
-CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre6
PKG_SUPPORTED_OPTIONS= sun-jre-jce