summaryrefslogtreecommitdiff
path: root/packages/classpath/classpath.inc
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-26 15:35:52 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-26 15:35:52 +0000
commitde9009f8e9bfdad0343494ba99e3ae4e830fb871 (patch)
tree698255efa5035f9e055afef359d39154a2392910 /packages/classpath/classpath.inc
parenta46613fd6a2998861272090c62e7d3d7a8b93325 (diff)
parent6e5e69478c517beaa1c74b947c5043441d9397f5 (diff)
merge of '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
and 'b04f946bcf310267d7557532bc06f235d79f8226'
Diffstat (limited to 'packages/classpath/classpath.inc')
-rw-r--r--packages/classpath/classpath.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index cee09857e4..65bc465200 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -17,6 +17,7 @@ RPROVIDES_${PN}-common = "${PBN}-common"
RPROVIDES_${PN}-gtk = "${PBN}-awt"
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
S = "${WORKDIR}/${PBN}-${PV}"
@@ -30,21 +31,19 @@ EXTRA_OECONF = "\
inherit autotools
-# hack to get config.rpath in, it comes from gettext
do_configure_prepend () {
- ${@['','cp ${STAGING_DATADIR_NATIVE}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
-
+ cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
}
do_stage() {
install -d ${STAGING_INCDIR}/classpath
install -m 0644 include/jni* ${STAGING_INCDIR}/classpath
- install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/
+ install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/
- install -d ${STAGING_DATADIR}/classpath
- install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath
+ install -d ${STAGING_DATADIR}/classpath
+ install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath
}
do_install() {