diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-09-03 16:23:01 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-09-03 16:23:01 +0000 |
| commit | 6a5d768670459f2a597670bf143f61deaeb00ac5 (patch) | |
| tree | 4ec3f3fc9561c45f83247118ea601fb08472087f /java | |
| parent | Add CONFLICTS with openvpn-devel (diff) | |
. JAVALIBDIR is more appropriate than JAVAJARDIR now we have it.
Notes
Notes:
svn path=/head/; revision=118047
Diffstat (limited to 'java')
| -rw-r--r-- | java/javavmwrapper/Makefile | 4 | ||||
| -rw-r--r-- | java/javavmwrapper/src/classpath.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 32bb8dca3f28..780013538979 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -23,7 +23,7 @@ SRC= ${.CURDIR}/src SCRIPTS= classpath javavmwrapper # This is normally defined by bsd.java.mk when USE_JAVA is defined, but # we can't do that here since it would result in a circular dependency -JAVAJARDIR= ${PREFIX}/share/java/classes +JAVALIBDIR= ${LOCALBASE}/share/java/classes do-fetch: @${DO_NADA} @@ -31,7 +31,7 @@ do-fetch: do-configure: .for _script in ${SCRIPTS} ${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \ - -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|;' \ + -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|;' \ <${SRC}/${_script}.sh >${WRKDIR}/${_script}.sh .endfor diff --git a/java/javavmwrapper/src/classpath.sh b/java/javavmwrapper/src/classpath.sh index 04d714c0fad7..1c0c2ecff139 100644 --- a/java/javavmwrapper/src/classpath.sh +++ b/java/javavmwrapper/src/classpath.sh @@ -3,9 +3,9 @@ # $FreeBSD$ # -JAVAJARDIR=%%JAVAJARDIR%% +JAVALIBDIR=%%JAVALIBDIR%% echo -n . -find -s ${JAVAJARDIR} -name '*.jar' | while read jar ; do +find -s ${JAVALIBDIR} -name '*.jar' | while read jar ; do echo -n ":${jar}" done |