summaryrefslogtreecommitdiff
path: root/kBuild/header.kmk
diff options
context:
space:
mode:
Diffstat (limited to 'kBuild/header.kmk')
-rw-r--r--kBuild/header.kmk21
1 files changed, 14 insertions, 7 deletions
diff --git a/kBuild/header.kmk b/kBuild/header.kmk
index a4f51f3..852c1a6 100644
--- a/kBuild/header.kmk
+++ b/kBuild/header.kmk
@@ -1,4 +1,4 @@
-# $Id: header.kmk 2577 2012-06-04 11:01:00Z bird $
+# $Id: header.kmk 2689 2013-07-11 21:31:43Z bird $
## @file
# kBuild - File included at top of a makefile.
#
@@ -79,7 +79,7 @@ endif
# The revision in which this file was last modified.
# This can be useful when using development versions of kBuild.
#
-KMK_REVISION := $(patsubst %:,, $Rev: 2577 $ )
+KMK_REVISION := $(patsubst %:,, $Rev: 2689 $ )
#
@@ -1276,10 +1276,17 @@ else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd dragonfly)
KBUILD_LIB_SEARCH_SUBS := lib/
else ifeq ($(KBUILD_TARGET),linux)
- KBUILD_LIB_SEARCH_ROOTS := \
- / \
- /usr/ \
- /usr/local/
+ ifeq ($(realpath /bin),/usr/bin)
+ KBUILD_LIB_SEARCH_ROOTS := \
+ /usr/ \
+ / \
+ /usr/local/
+ else
+ KBUILD_LIB_SEARCH_ROOTS := \
+ / \
+ /usr/ \
+ /usr/local/
+ endif
ifeq ($(KBUILD_TARGET_ARCH),amd64)
KBUILD_LIB_SEARCH_SUBS := \
lib/x86_64-linux-gnu/ \
@@ -1562,6 +1569,6 @@ endif
# end-of-file-content
__header_kmk__ := 1
-endif # __header_kmk__
+endif # !__header_kmk__