diff options
| author | Johannes Huber <johu@gentoo.org> | 2013-04-20 15:26:45 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-04-20 15:27:52 +0200 |
| commit | 2d1d6a23e58b2e036c235db1ced0711c01d34794 (patch) | |
| tree | df86caadddc7854469d92a111e1525e64cfa194f /eclass | |
| parent | 09a03aa8cf0fa8c0067827f3af386940a2cb6d6d (diff) | |
| download | kde-2d1d6a23e58b2e036c235db1ced0711c01d34794.tar.gz kde-2d1d6a23e58b2e036c235db1ced0711c01d34794.tar.bz2 kde-2d1d6a23e58b2e036c235db1ced0711c01d34794.zip | |
[eclass] Fix src_install by kensington, bug #459678.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index cde381ddecf..053572480bf 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -543,9 +543,10 @@ enable_cmake-utils_src_install() { _check_build_dir pushd "${BUILD_DIR}" > /dev/null - DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install" + popd > /dev/null + pushd "${S}" > /dev/null #Install docs, copied from base_src_install_docs local x @@ -562,9 +563,6 @@ enable_cmake-utils_src_install() { done fi - popd > /dev/null - - # Backward compatibility, for non-array variables if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then dodoc ${DOCS} || die "dodoc failed" @@ -572,6 +570,8 @@ enable_cmake-utils_src_install() { if [[ -n "${HTML_DOCS}" ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then dohtml -r ${HTML_DOCS} || die "dohtml failed" fi + + popd > /dev/null } enable_cmake-utils_src_test() { |