merge r27256

SVN-Revision: 27257

diff --git a/include/cmake.mk b/include/cmake.mk
index b419f004ae2ebaafbf4f9e134a58f9901e61e412..7ff97f5df8f42671e2fe2a58d3978bb1bba5d705 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -33,9 +33,9 @@ define Build/Configure/Default
                        -DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
-                       -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=$(STAGING_DIR_HOST) \
-                       -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=$(STAGING_DIR) \
-                       -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_DIR) \
+                       -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
+                       -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+                       -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
                        -DCMAKE_STRIP=: \
                        -DCMAKE_INSTALL_PREFIX=/usr \
                        $(CMAKE_OPTIONS) \