diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-01-10 09:26:09 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-01-10 09:26:09 +0000 |
| commit | 9144b2cce528157499408b1fed1ebc8efae370d4 (patch) | |
| tree | 5873c179cc4c687840a99389bc1d91ccaa3e7e42 | |
| parent | Inside kernel_is, use a non-keyword for the variable name, and quote the actu... (diff) | |
| download | historical-9144b2cce528157499408b1fed1ebc8efae370d4.tar.gz historical-9144b2cce528157499408b1fed1ebc8efae370d4.tar.bz2 historical-9144b2cce528157499408b1fed1ebc8efae370d4.zip | |
Bug #286145: More flexible logic for OUTPUT_DIR defaults.
| -rw-r--r-- | eclass/linux-info.eclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 3e6c566f4602..23690760c247 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.80 2010/01/10 09:25:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.81 2010/01/10 09:26:09 robbat2 Exp $ # # Original author: John Mylchreest <johnm@gentoo.org> # Maintainer: kernel-misc@gentoo.org @@ -520,8 +520,7 @@ get_version() { # but before we do this, we need to find if we use a different object directory. # This *WILL* break if the user is using localversions, but we assume it was # caught before this if they are. - [ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}" == "$(uname -r)" ] && \ - OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}" + OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build}" [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})" [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}" |