diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-03 10:33:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-03 10:33:50 +0000 |
| commit | 9179aa1390a07b8468968972d12786227c1def9f (patch) | |
| tree | f5d5c5e5e8016bba633384e24b63ab31ff075415 /eclass/cmake-utils.eclass | |
| parent | Remove old. (diff) | |
| download | gentoo-2-9179aa1390a07b8468968972d12786227c1def9f.tar.gz gentoo-2-9179aa1390a07b8468968972d12786227c1def9f.tar.bz2 gentoo-2-9179aa1390a07b8468968972d12786227c1def9f.zip | |
Oops, forgot the sed.
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 9f1b8bacf8c1..453d4acd4c24 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.87 2012/12/03 09:29:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.88 2012/12/03 10:33:50 mgorny Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -170,16 +170,16 @@ _check_build_dir() { else # Respect both the old variable and the new one, depending # on which one was set by the ebuild. - if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then - eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR." + if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then + eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR." eqawarn "Please migrate the ebuild to use the new one." # In the next call, both variables will be set already # and we'd have to know which one takes precedence. - _RESPECT_AUTOTOOLS_BUILD_DIR=1 + _RESPECT_CMAKE_BUILD_DIR=1 fi - if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then - BUILD_DIR=${AUTOTOOLS_BUILD_DIR} + if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then + BUILD_DIR=${CMAKE_BUILD_DIR} fi : ${BUILD_DIR:=${WORKDIR}/${P}_build} |