diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 06:26:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 06:26:27 +0200 |
| commit | 90f063cdaa362277b19eac3d3e3ebeb6227b4da3 (patch) | |
| tree | 58f05de6554dd97a6afffada929aa5402dab2117 /jtools/jamvm/Makefile | |
| parent | f41e4877defd5be85457121c5fd9b923a943d8ed (diff) | |
| parent | 432ae1a94f4d543da3aa2ed226cd3c00e350e3c4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'jtools/jamvm/Makefile')
| -rw-r--r-- | jtools/jamvm/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index defdbd713..a85b2d6c8 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} @@ -23,7 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared CC='${CC_FOR_BUILD}' \ CXX='${CXX_FOR_BUILD}' \ ./configure \ - --prefix=/usr \ + --prefix=$(STAGING_JAVA_HOST_DIR)/usr \ --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr touch $@ @@ -32,8 +32,8 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured touch $@ ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE) + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk |