diff options
Diffstat (limited to 'comms/java-rxtx/Makefile')
| -rw-r--r-- | comms/java-rxtx/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile index 2dd8e469e48..571f52425f7 100644 --- a/comms/java-rxtx/Makefile +++ b/comms/java-rxtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/08/13 20:16:22 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2015/12/29 04:54:37 dholland Exp $ # DISTNAME= rxtx-2.1-7r2 @@ -32,7 +32,7 @@ JAVA_MACHINE_ARCH= amd64 .elif !empty(MACHINE_CPU:Marm*) JAVA_MACHINE_ARCH= arm .else -JAVA_MACHINE_ARCH= ${MACHINE_ARCH} +JAVA_MACHINE_ARCH= ${MACHINE_ARCH} .endif .include "../../mk/java-vm.mk" @@ -42,20 +42,20 @@ JAVA_MACHINE_ARCH= ${MACHINE_ARCH} # processing, PKG_JAVA_HOME will match the Pkgsrc JRE home, which is a # suitable installation location for Native JRE, as well as being the # correct installation location for Pkgsrc JRE. -JAVA_INSTALL_BASE:= ${PKG_JAVA_HOME} - -RXTX_PATH= ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH} -JHOME_PATH= ${JAVA_INSTALL_BASE}/jre/lib/ext - -MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} -MAKE_FLAGS+= RXTX_PATH=${RXTX_PATH:Q} -MAKE_FLAGS+= JHOME=${JHOME_PATH:Q} - -INSTALLATION_DIRS+= ${RXTX_PATH:Q} ${JHOME_PATH:Q} - -PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} -PLIST_SUBST+= JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}" - +JAVA_INSTALL_BASE:= ${PKG_JAVA_HOME} + +RXTX_PATH= ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH} +JHOME_PATH= ${JAVA_INSTALL_BASE}/jre/lib/ext + +MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} +MAKE_FLAGS+= RXTX_PATH=${RXTX_PATH:Q} +MAKE_FLAGS+= JHOME=${JHOME_PATH:Q} + +INSTALLATION_DIRS+= ${RXTX_PATH:Q} ${JHOME_PATH:Q} + +PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} +PLIST_SUBST+= JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}" + pre-configure: set -e; cd ${WRKSRC}; \ aclocal; autoheader; automake -a --foreign -i; autoconf |