diff options
author | Henning Heinold <henning@itconsulting-heinold.de> | 2014-06-26 23:12:27 +0200 |
---|---|---|
committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-06-26 23:12:27 +0200 |
commit | d2b75b615e4612f9fa05950c1d76d4a719e573d4 (patch) | |
tree | 8d7f8540ca646608b6a75e1936658d2407dc6024 /recipes-core | |
parent | f4c4649ed4b6d6970ca99a715e38f35307cf3134 (diff) | |
download | meta-java-d2b75b615e4612f9fa05950c1d76d4a719e573d4.tar.gz |
openjdk: fix do_install for out of source builds
Diffstat (limited to 'recipes-core')
-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 746751b..5aa435d 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 ${S}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | 237 | cp -R ${WORKDIR}/build/${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 4a08fe8..32fab16 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 ${S}/build/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | 175 | cp -R ${WORKDIR}/build/${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 | ||