diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
| commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
| tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /jtools/jamvm | |
| parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
| parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'jtools/jamvm')
| -rw-r--r-- | jtools/jamvm/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index 639b7d875..defdbd713 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -20,11 +20,11 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm $(WRKBUILD)/.configured: ${WRKDIST}/.prepared cd $(WRKBUILD); env \ - CC='${CC_FOR_BUILD}' \ - CXX='${CXX_FOR_BUILD}' \ - ./configure \ - --prefix=/usr \ - --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) + CC='${CC_FOR_BUILD}' \ + CXX='${CXX_FOR_BUILD}' \ + ./configure \ + --prefix=/usr \ + --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr touch $@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured @@ -33,5 +33,7 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured ${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 include $(TOPDIR)/mk/tools.mk |