summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-12-03 12:05:51 +0000
committerMichał Górny <mgorny@gentoo.org>2012-12-03 12:05:51 +0000
commitc41288c044eb3db674652c7db6a888430de162a7 (patch)
tree7edcdf98106541a8bb830d52046cf9114d0a1b79 /eclass/autotools-utils.eclass
parentMigrate to BUILD_DIR. This subshelling thing is so hacky the compatibility co... (diff)
downloadgentoo-2-c41288c044eb3db674652c7db6a888430de162a7.tar.gz
gentoo-2-c41288c044eb3db674652c7db6a888430de162a7.tar.bz2
gentoo-2-c41288c044eb3db674652c7db6a888430de162a7.zip
Improve the compatibility code thanks to Arfrever.
Diffstat (limited to 'eclass/autotools-utils.eclass')
-rw-r--r--eclass/autotools-utils.eclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 3bdb9abe1a73..7bdc5d6db999 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-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/autotools-utils.eclass,v 1.59 2012/12/03 09:29:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.60 2012/12/03 12:05:51 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -198,11 +198,12 @@ _check_build_dir() {
# and we'd have to know which one takes precedence.
_RESPECT_AUTOTOOLS_BUILD_DIR=1
fi
+
if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then
- BUILD_DIR=${AUTOTOOLS_BUILD_DIR}
+ BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build}
+ else
+ : ${BUILD_DIR:=${WORKDIR}/${P}_build}
fi
-
- : ${BUILD_DIR:=${WORKDIR}/${P}_build}
fi
# Backwards compatibility for getting the value.