build: set up host command for egrep

[openwrt/openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 900dae1d4afc6007f8ac04179dd7f0922a07d4fa..a5ba7d31bf92a5463986009b2735d37a3859ad39 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -7,8 +7,8 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
 endif
 
 CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
-CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR)
-HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR)
+CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_SOURCE_SUBDIR),/$(CMAKE_SOURCE_SUBDIR))
+HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR)$(if $(CMAKE_SOURCE_SUBDIR),/$(CMAKE_SOURCE_SUBDIR))
 MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)
 
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@ -103,6 +103,7 @@ define Host/Configure/Default
                        -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
                        -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
                        -DCMAKE_SKIP_RPATH=TRUE  \
+                       -DCMAKE_INSTALL_LIBDIR=lib \
                        $(CMAKE_HOST_OPTIONS) \
                $(HOST_CMAKE_SOURCE_DIR) \
        )