diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
commit | 4b7a7c1333333ce0f1567cfda15fb86222be2301 (patch) | |
tree | 52ca6663c6c95635d7afa18c3cf750280b498c62 /package/jamvm | |
parent | e31358b57662bb44613874e6cb5d5569309910af (diff) | |
parent | 103810049b157dc809c82a0136e23fe4276b9750 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/pulseaudio/Makefile
Diffstat (limited to 'package/jamvm')
-rw-r--r-- | package/jamvm/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 6d21b6311..4c0798c26 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -16,10 +16,14 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} PKG_ARCH_DEPENDS:= !m68k +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -31,6 +35,10 @@ ifeq ($(ARCH),arm) CONFIGURE_ARGS+= --disable-tls endif +hostpost-install: + ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java + ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java + do-build: ${INSTALL_DIR} ${WRKINST}/usr/bin ${INSTALL_DIR} ${WRKINST}/usr/share/jamvm @@ -47,4 +55,5 @@ do-install: ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ ${IDIR_JAMVM}/usr/share/jamvm +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |