summaryrefslogtreecommitdiffstats
path: root/make/include/main.defs
diff options
context:
space:
mode:
Diffstat (limited to 'make/include/main.defs')
-rw-r--r--make/include/main.defs12
1 files changed, 11 insertions, 1 deletions
diff --git a/make/include/main.defs b/make/include/main.defs
index 504d814cc..a6ea8a4cd 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -12,17 +12,27 @@ ifeq (1,$(FEATURE.local_pkgconfig))
MODULES += contrib/pkgconfig
endif
+HB_TOOLS_PATH =
+ifeq (1,$(FEATURE.local_cmake))
+ MODULES += contrib/cmake
+ HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
+endif
+
ifeq (1,$(FEATURE.local_autotools))
MODULES += contrib/autoconf
MODULES += contrib/automake
MODULES += contrib/libtool
MODULES += contrib/m4
AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4
- PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)
+ HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
else
AUTOTOOL_MODULES =
endif
+ifneq (,$(HB_TOOLS_PATH))
+ PATH := $(HB_TOOLS_PATH):$(PATH)
+endif
+
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.bz2),1)
MODULES += contrib/bzip2