diff --git a/src/cmake-conf.mk b/src/cmake-conf.mk index 3a1c86d0..fc653411 100644 --- a/src/cmake-conf.mk +++ b/src/cmake-conf.mk @@ -4,8 +4,9 @@ PKG := cmake-conf $(PKG)_VERSION := 1 $(PKG)_UPDATE := echo 1 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) -$(PKG)_DEPS := $(BUILD)~cmake +$(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*) +$(PKG)_DEPS_$(BUILD) := cmake define $(PKG)_BUILD # create the CMake toolchain file using template diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 409e0201..8e4b7f23 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -9,7 +9,7 @@ $(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) -$(PKG)_DEPS := +$(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_DEPS_$(BUILD) := libtool $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master) @@ -32,6 +32,7 @@ define $(PKG)_BUILD chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' # create cmake file + mkdir -p '$(CMAKE_TOOLCHAIN_DIR)' echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config CACHE PATH "pkg-config executable")' \ > '$(CMAKE_TOOLCHAIN_DIR)/pkgconf.cmake'