diff options
author | Max Krummenacher <max.oss.09@gmail.com> | 2014-12-26 18:36:26 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-12-26 17:32:52 -0200 |
commit | 52e197ac06d296e17189f4a01ccf1d626df90cfa (patch) | |
tree | 94ff8f415b43fa5ad83d9c549b32686abb24f002 | |
parent | 4c72cba71b5af66966676c9eaef9b6fa7ee0191b (diff) | |
download | meta-java-52e197ac06d296e17189f4a01ccf1d626df90cfa.tar.gz |
openjdk: fix do_install for out of source builds
use ${B} to specify the build directory, thus keep working for
daisy and older versions as well as for dizzy and newer.
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index 5aa435d..4254c9f 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
@@ -234,7 +234,7 @@ do_compile() { | |||
234 | 234 | ||
235 | do_install() { | 235 | do_install() { |
236 | install -d ${D}${libdir_jvm} | 236 | install -d ${D}${libdir_jvm} |
237 | cp -R ${WORKDIR}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | 237 | cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} |
238 | 238 | ||
239 | chmod u+rw -R ${D}${JDK_HOME} | 239 | chmod u+rw -R ${D}${JDK_HOME} |
240 | 240 | ||
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 32fab16..e14603c 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -172,7 +172,7 @@ do_compile() { | |||
172 | 172 | ||
173 | do_install() { | 173 | do_install() { |
174 | install -d ${D}${libdir_jvm} | 174 | install -d ${D}${libdir_jvm} |
175 | cp -R ${WORKDIR}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | 175 | cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} |
176 | 176 | ||
177 | chmod u+rw -R ${D}${JDK_HOME} | 177 | chmod u+rw -R ${D}${JDK_HOME} |
178 | 178 | ||