From: Stefan Schweizer Date: Tue, 5 Dec 2006 18:16:09 +0000 (+0000) Subject: Fix KV_OUT detection X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83a872f5dcf47ed8a11bd71be5f5580b11c5a863;p=gentoo.git Fix KV_OUT detection --- diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 9640a2aad7b5..d59fe2213a43 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.48 2006/09/07 11:37:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.49 2006/12/05 18:16:09 genstef Exp $ # # Description: This eclass is used as a central eclass for accessing kernel # related information for sources already installed. @@ -280,8 +280,8 @@ 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}" + [ "${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}" [ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})" [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"