summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-06 15:21:46 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-06 15:21:46 +0200
commit15b9a1baf51b7a15a68b8496d20c063ff8074a35 (patch)
tree9686ce873349b29d4616e8c7a91c7efa26785833 /mk
parent6a40f2f84bc5dd0b4664bef9e4f3309e21826ecb (diff)
downloadembtoolkit-15b9a1baf51b7a15a68b8496d20c063ff8074a35.tar.gz
embtoolkit-15b9a1baf51b7a15a68b8496d20c063ff8074a35.tar.bz2
embtoolkit-15b9a1baf51b7a15a68b8496d20c063ff8074a35.tar.xz
Build system: replace HOSTTOOLS -> embtk_htools
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/autoconf.mk2
-rw-r--r--mk/automake.mk2
-rw-r--r--mk/buildsystem.mk17
-rw-r--r--mk/ccache.mk2
-rw-r--r--mk/fakeroot.mk2
-rw-r--r--mk/fs.mk4
-rw-r--r--mk/gmp.mk2
-rw-r--r--mk/libtool.mk4
-rw-r--r--mk/linux.mk2
-rw-r--r--mk/m4.mk2
-rw-r--r--mk/macros.packages.mk8
-rw-r--r--mk/makedevs.mk6
-rw-r--r--mk/mkimage.mk6
-rw-r--r--mk/mpc.mk2
-rw-r--r--mk/mpfr.mk2
-rw-r--r--mk/mtd-utils.mk6
-rw-r--r--mk/pkgconfig.mk6
-rw-r--r--mk/squashfs.mk18
-rw-r--r--mk/toolchain.mk2
-rw-r--r--mk/zlib_host.mk6
20 files changed, 50 insertions, 51 deletions
diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 942a3e0..7bfa522 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -31,7 +31,7 @@ AUTOCONF_SRC_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION)
AUTOCONF_BUILD_DIR := $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION)
# autoconf binaries
-AUTOCONF_DIR := $(HOSTTOOLS)/usr
+AUTOCONF_DIR := $(embtk_htools)/usr
AUTOCONF := $(AUTOCONF_DIR)/bin/autoconf
AUTOHEADER := $(AUTOCONF_DIR)/bin/autoheader
AUTOM4TE := $(AUTOCONF_DIR)/bin/autom4te
diff --git a/mk/automake.mk b/mk/automake.mk
index 6d32406..d13016b 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -30,7 +30,7 @@ AUTOMAKE_PACKAGE := automake-$(AUTOMAKE_VERSION).tar.xz
AUTOMAKE_SRC_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION)
AUTOMAKE_BUILD_DIR := $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION)
-AUTOMAKE_DIR := $(HOSTTOOLS)/usr
+AUTOMAKE_DIR := $(embtk_htools)/usr
ACLOCAL := $(AUTOMAKE_DIR)/bin/aclocal
AUTOMAKE := $(AUTOMAKE_DIR)/bin/automake
export ACLOCAL AUTOMAKE
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index 7469cc2..5a0595c 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -17,9 +17,8 @@
#
################################################################################
#
-# \file initialpath.mk
-# \brief initialpath of Embtoolkit. Here we define SYSROOT, TOOLS,
-# \brief TOOLS_BUILD PACKAGES_BUILD and ROOTFS.
+# \file buildsystem.mk
+# \brief buildsystem.mk of Embtoolkit.
# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
# \date May 2009
################################################################################
@@ -43,7 +42,7 @@ embtk_toolsb := $(TOOLS_BUILD)
embtk_pkgb := $(PACKAGES_BUILD)
embtk_generated := $(EMBTK_GENERATED)
embtk_rootfs := $(ROOTFS)
-embtk_hosttools := $(HOSTTOOLS)
+embtk_htools := $(HOSTTOOLS)
__embtk_dldir := $(patsubst %/,%,$(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_DOWNLOAD_DIR)))
embtk_dldir := $(or $(__embtk_dldir),$(EMBTK_ROOT)/dl)
@@ -147,10 +146,10 @@ define __embtk_mk_inittoolsdirs
endef
define __embtk_mk_inithosttoolsdirs
- mkdir -p $(HOSTTOOLS)
- mkdir -p $(HOSTTOOLS)/usr
- mkdir -p $(HOSTTOOLS)/usr/include
- mkdir -p $(HOSTTOOLS)/usr/local
+ mkdir -p $(embtk_htools)
+ mkdir -p $(embtk_htools)/usr
+ mkdir -p $(embtk_htools)/usr/include
+ mkdir -p $(embtk_htools)/usr/local
endef
define __embtk_kconfig_clean
@@ -175,5 +174,5 @@ endef
rmallpath:
$(Q)rm -rf $(embtk_pkgb)* $(embtk_rootfs)* $(embtk_tools)* $(embtk_toolsb)*
- $(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(embtk_generated)/rootfs-*
+ $(Q)rm -rf $(embtk_sysroot)* $(embtk_htools)* $(embtk_generated)/rootfs-*
$(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch)
diff --git a/mk/ccache.mk b/mk/ccache.mk
index 3a05374..0c7b800 100644
--- a/mk/ccache.mk
+++ b/mk/ccache.mk
@@ -35,7 +35,7 @@ CCACHE_PACKAGE := ccache-$(CCACHE_VERSION).tar.bz2
CCACHE_SRC_DIR := $(embtk_toolsb)/ccache-$(CCACHE_VERSION)
CCACHE_BUILD_DIR := $(embtk_toolsb)/ccachehost-build
-CCACHE_HOST_DIR := $(HOSTTOOLS)/usr/local/ccachehost
+CCACHE_HOST_DIR := $(embtk_htools)/usr/local/ccachehost
CCACHE_DIR := $(EMBTK_ROOT)/.ccache
CCACHE_BIN := $(CCACHE_HOST_DIR)/bin/ccache
diff --git a/mk/fakeroot.mk b/mk/fakeroot.mk
index f509a09..bb9be98 100644
--- a/mk/fakeroot.mk
+++ b/mk/fakeroot.mk
@@ -33,7 +33,7 @@ FAKEROOT_SRC_DIR := $(embtk_toolsb)/fakeroot-$(FAKEROOT_VERSION)
FAKEROOT_BUILD_DIR := $(embtk_toolsb)/fakeroot-build
# fakeroot binaries and env
-FAKEROOT_BIN := $(HOSTTOOLS)/usr/bin/fakeroot
+FAKEROOT_BIN := $(embtk_htools)/usr/bin/fakeroot
FAKEROOT_ENV_FILE := $(EMBTK_ROOT)/.fakeroot.001
export FAKEROOT_BIN FAKEROOT_ENV_FILE
diff --git a/mk/fs.mk b/mk/fs.mk
index 8480636..e1500e3 100644
--- a/mk/fs.mk
+++ b/mk/fs.mk
@@ -39,8 +39,8 @@ endef
#
# JFFS2 rootfs macro
#
-__embtk_mkjffs2 := $(HOSTTOOLS)/usr/sbin/mkfs.jffs2
-__embtk_sumtool := $(HOSTTOOLS)/usr/sbin/sumtool
+__embtk_mkjffs2 := $(embtk_htools)/usr/sbin/mkfs.jffs2
+__embtk_sumtool := $(embtk_htools)/usr/sbin/sumtool
__embtk_jffs2_eraseblksz := $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE)
__embtk_jffs2_pad := $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE)
__embtk_jffs2_pagesz := $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_PAGESIZE)
diff --git a/mk/gmp.mk b/mk/gmp.mk
index 8b0159f..3575b34 100644
--- a/mk/gmp.mk
+++ b/mk/gmp.mk
@@ -29,7 +29,7 @@ GMP_HOST_SITE := ftp://ftp.gmplib.org/pub/gmp-$(GMP_HOST_VERSION)
GMP_HOST_PACKAGE := gmp-$(GMP_HOST_VERSION).tar.bz2
GMP_HOST_SRC_DIR := $(embtk_toolsb)/gmp-$(GMP_HOST_VERSION)
GMP_HOST_BUILD_DIR := $(embtk_toolsb)/gmp-build
-GMP_HOST_DIR := $(HOSTTOOLS)/usr/local/gmp-host
+GMP_HOST_DIR := $(embtk_htools)/usr/local/gmp-host
export GMP_HOST_DIR
diff --git a/mk/libtool.mk b/mk/libtool.mk
index 0b71c1a..d5bb7d8 100644
--- a/mk/libtool.mk
+++ b/mk/libtool.mk
@@ -30,8 +30,8 @@ LIBTOOL_PACKAGE := libtool-$(LIBTOOL_VERSION).tar.gz
LIBTOOL_SRC_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION)
LIBTOOL_BUILD_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION)
-LIBTOOL := $(HOSTTOOLS)/usr/bin/libtool
-LIBTOOLIZE := $(HOSTTOOLS)/usr/bin/libtoolize
+LIBTOOL := $(embtk_htools)/usr/bin/libtool
+LIBTOOLIZE := $(embtk_htools)/usr/bin/libtoolize
export LIBTOOL LIBTOOLIZE
LIBTOOL_CONFIGURE_OPTS := --disable-ltdl-install
diff --git a/mk/linux.mk b/mk/linux.mk
index dc226e6..33edaa4 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -54,7 +54,7 @@ $(LINUX_BUILD_DIR)/.headers_installed:
INSTALL_HDR_PATH=$(embtk_sysroot)/usr
$(MAKE) -C $(LINUX_BUILD_DIR) distclean
$(MAKE) -C $(LINUX_BUILD_DIR) headers_install \
- INSTALL_HDR_PATH=$(HOSTTOOLS)/usr
+ INSTALL_HDR_PATH=$(embtk_htools)/usr
$(Q)touch $@
download_linux download_linux_headers:
diff --git a/mk/m4.mk b/mk/m4.mk
index fd1b3e3..9bf224d 100644
--- a/mk/m4.mk
+++ b/mk/m4.mk
@@ -32,7 +32,7 @@ M4_SRC_DIR := $(embtk_toolsb)/m4-$(M4_VERSION)
M4_BUILD_DIR := $(embtk_toolsb)/m4-$(M4_VERSION)
# m4 binaries
-M4_DIR := $(HOSTTOOLS)/usr
+M4_DIR := $(embtk_htools)/usr
M4_BIN := $(M4_DIR)/bin/m4
M4 := $(M4_BIN)
export M4
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index 0851979..4122650 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -308,12 +308,12 @@ endef
# Usage:
# $(call embtk_configure_hostpkg,PACKAGE)
#
-__embtk_hostpkg_rpathldflags = "-Wl,-rpath,$(HOSTTOOLS)/usr/lib"
+__embtk_hostpkg_rpathldflags = "-Wl,-rpath,$(embtk_htools)/usr/lib"
__embtk_hostpkg_rpath = $(strip $(if $(__embtk_pkg_setrpath), \
$(__embtk_hostpkg_rpathldflags)))
-__embtk_hostpkg_ldflags = -L$(HOSTTOOLS)/usr/lib $(__embtk_hostpkg_rpath)
-__embtk_hostpkg_cppflags = -I$(HOSTTOOLS)/usr/include
+__embtk_hostpkg_ldflags = -L$(embtk_htools)/usr/lib $(__embtk_hostpkg_rpath)
+__embtk_hostpkg_cppflags = -I$(embtk_htools)/usr/include
define embtk_configure_hostpkg
$(if $(EMBTK_BUILDSYS_DEBUG),
$(call embtk_pinfo,"Configure $(__embtk_pkg_package) for host..."))
@@ -331,7 +331,7 @@ define embtk_configure_hostpkg
$(CONFIG_SHELL) $(__embtk_pkg_srcdir)/configure \
--build=$(HOST_BUILD) --host=$(HOST_ARCH) \
--prefix=$(strip $(if $(__embtk_pkg_prefix), \
- $(__embtk_pkg_prefix),$(HOSTTOOLS)/usr)) \
+ $(__embtk_pkg_prefix),$(embtk_htools)/usr)) \
$(__embtk_pkg_configureopts)
$(Q)touch $(__embtk_pkg_dotconfigured_f)
endef
diff --git a/mk/makedevs.mk b/mk/makedevs.mk
index 75f302b..20cba03 100644
--- a/mk/makedevs.mk
+++ b/mk/makedevs.mk
@@ -26,7 +26,7 @@ MAKEDEVS_NAME := makedevs
MAKEDEVS_BUILD_DIR := $(embtk_toolsb)/makedevs-build
MAKEDEVS_SRC := $(EMBTK_ROOT)/src/makedevs
-MAKEDEVS_DIR := $(HOSTTOOLS)/usr/bin
+MAKEDEVS_DIR := $(embtk_htools)/usr/bin
MAKEDEVS_BIN := $(MAKEDEVS_DIR)/makedevs
makedevs_install:
@@ -36,8 +36,8 @@ makedevs_install:
$(MAKEDEVS_BUILD_DIR)/.installed:
$(call embtk_pinfo,"Installing makedevs...")
$(Q)mkdir -p $(MAKEDEVS_BUILD_DIR)
- $(Q)mkdir -p $(HOSTTOOLS)/usr
- $(Q)mkdir -p $(HOSTTOOLS)/usr/bin
+ $(Q)mkdir -p $(embtk_htools)/usr
+ $(Q)mkdir -p $(embtk_htools)/usr/bin
$(hostcc_cached) -o $(MAKEDEVS_BIN) $(wildcard $(MAKEDEVS_SRC)/*.c)
$(Q)touch $@
diff --git a/mk/mkimage.mk b/mk/mkimage.mk
index 551e3db..783b78b 100644
--- a/mk/mkimage.mk
+++ b/mk/mkimage.mk
@@ -28,7 +28,7 @@ MAKEIMAGE_VERSION := 0.4
MAKEIMAGE_SITE := http://ftp.debian.org/debian/pool/main/u/uboot-mkimage
MAKEIMAGE_PACKAGE :=
MAKEIMAGE_BUILD_DIR := $(embtk_toolsb)/mkimage
-MAKEIMAGE_BIN := $(HOSTTOOLS)/usr/bin/mkimage
+MAKEIMAGE_BIN := $(embtk_htools)/usr/bin/mkimage
export MAKEIMAGE_BIN
mkimage_install:
@@ -37,8 +37,8 @@ mkimage_install:
$(MAKEIMAGE_BUILD_DIR)/.installed: zlib_host_install
$(Q)cp -R $(EMBTK_ROOT)/src/mkimage $(embtk_toolsb)/
- $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) CPPFLAGS="-I$(HOSTTOOLS)/usr/include"
- $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) DESTDIR=$(HOSTTOOLS) install
+ $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) CPPFLAGS="-I$(embtk_htools)/usr/include"
+ $(MAKE) -C $(MAKEIMAGE_BUILD_DIR) DESTDIR=$(embtk_htools) install
@touch $@
download_mkimage:
diff --git a/mk/mpc.mk b/mk/mpc.mk
index 7fd4a39..54348f0 100644
--- a/mk/mpc.mk
+++ b/mk/mpc.mk
@@ -29,7 +29,7 @@ MPC_HOST_SITE := http://www.multiprecision.org/mpc/download
MPC_HOST_PACKAGE := mpc-$(MPC_HOST_VERSION).tar.gz
MPC_HOST_SRC_DIR := $(embtk_toolsb)/mpc-$(MPC_HOST_VERSION)
MPC_HOST_BUILD_DIR := $(embtk_toolsb)/mpc-build
-MPC_HOST_DIR := $(HOSTTOOLS)/usr/local/mpc-host
+MPC_HOST_DIR := $(embtk_htools)/usr/local/mpc-host
export MPC_HOST_DIR
diff --git a/mk/mpfr.mk b/mk/mpfr.mk
index 0a26a8d..0f157ca 100644
--- a/mk/mpfr.mk
+++ b/mk/mpfr.mk
@@ -29,7 +29,7 @@ MPFR_HOST_SITE := http://www.mpfr.org/mpfr-$(MPFR_HOST_VERSION)
MPFR_HOST_PACKAGE := mpfr-$(MPFR_HOST_VERSION).tar.bz2
MPFR_HOST_SRC_DIR := $(embtk_toolsb)/mpfr-$(MPFR_HOST_VERSION)
MPFR_HOST_BUILD_DIR := $(embtk_toolsb)/mpfr-build
-MPFR_HOST_DIR := $(HOSTTOOLS)/usr/local/mpfr-host
+MPFR_HOST_DIR := $(embtk_htools)/usr/local/mpfr-host
export MPFR_HOST_DIR
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index 776f50d..2189e65 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -72,9 +72,9 @@ MTDUTILS_HOST_BUILD_DIR := $(embtk_toolsb)/mtd-utils-$(MTDUTILS_VERSION)
MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install \
e2fsprogs_host_install
-MTDUTILS_HOST_MAKE_ENV := LDFLAGS="-L$(HOSTTOOLS)/usr/lib"
-MTDUTILS_HOST_MAKE_ENV += CPPFLAGS="-I. -Iinclude -I../include -I$(HOSTTOOLS)/usr/include"
-MTDUTILS_HOST_MAKE_ENV += DESTDIR=$(HOSTTOOLS)
+MTDUTILS_HOST_MAKE_ENV := LDFLAGS="-L$(embtk_htools)/usr/lib"
+MTDUTILS_HOST_MAKE_ENV += CPPFLAGS="-I. -Iinclude -I../include -I$(embtk_htools)/usr/include"
+MTDUTILS_HOST_MAKE_ENV += DESTDIR=$(embtk_htools)
MTDUTILS_HOST_MAKE_ENV += BUILDDIR=$(MTDUTILS_HOST_BUILD_DIR)
mtdutils_host_install:
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index 3812e33..6dfdd8a 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -29,14 +29,14 @@ PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz
PKGCONFIG_SRC_DIR := $(embtk_toolsb)/pkg-config-$(PKGCONFIG_VERSION)
PKGCONFIG_BUILD_DIR := $(embtk_toolsb)/pkg-config-$(PKGCONFIG_VERSION)
-PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config
+PKGCONFIG_BIN := $(embtk_htools)/usr/bin/pkg-config
__EMBTK_PKG_CONFIG_PATH := $(embtk_sysroot)/usr/$(LIBDIR)/pkgconfig
__EMBTK_PKG_CONFIG_PATH += $(embtk_sysroot)/usr/share/pkgconfig
EMBTK_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(__EMBTK_PKG_CONFIG_PATH))
EMBTK_PKG_CONFIG_LIBDIR := $(EMBTK_PKG_CONFIG_PATH)
-__EMBTK_HOST_PKG_CONFIG_PATH := $(HOSTTOOLS)/usr/lib/pkgconfig/
+__EMBTK_HOST_PKG_CONFIG_PATH := $(embtk_htools)/usr/lib/pkgconfig/
__EMBTK_HOST_PKG_CONFIG_PATH += /usr/lib/pkgconfig/ /usr/share/pkgconfig/
__EMBTK_HOST_PKG_CONFIG_PATH += /usr/local/lib/pkgconfig/ /usr/local/share/pkgconfig/
__EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/lib -type f -name '*.pc'))
@@ -50,7 +50,7 @@ export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR
export EMBTK_HOST_PKG_CONFIG_PATH
PKGCONFIG_PREFIX := /usr
-PKGCONFIG_DESTDIR := $(HOSTTOOLS)
+PKGCONFIG_DESTDIR := $(embtk_htools)
pkgconfig_install:
$(call embtk_install_hostpkg,pkgconfig)
diff --git a/mk/squashfs.mk b/mk/squashfs.mk
index 856fe37..c0aa2c3 100644
--- a/mk/squashfs.mk
+++ b/mk/squashfs.mk
@@ -30,8 +30,8 @@ SQUASHFS_TOOLS_PACKAGE := squashfs$(SQUASHFS_TOOLS_VERSION).tar.gz
SQUASHFS_TOOLS_SRC_DIR := $(embtk_toolsb)/squashfs$(SQUASHFS_TOOLS_VERSION)
SQUASHFS_TOOLS_BUILD_DIR := $(SQUASHFS_TOOLS_SRC_DIR)/squashfs-tools
-MKSQUASHFS_BIN := $(HOSTTOOLS)/usr/bin/mksquashfs
-UNSQUASHFS_BIN := $(HOSTTOOLS)/usr/bin/unsquashfs
+MKSQUASHFS_BIN := $(embtk_htools)/usr/bin/mksquashfs
+UNSQUASHFS_BIN := $(embtk_htools)/usr/bin/unsquashfs
SQUASHFS_TOOLS_DEPS := zlib_host_install
@@ -45,13 +45,13 @@ $(SQUASHFS_TOOLS_BUILD_DIR)/.installed:
$(call embtk_decompress_pkg,squashfs_tools)
$(Q)$(MAKE) -C $(SQUASHFS_TOOLS_BUILD_DIR) \
CC=$(HOSTCC_CACHED) \
- CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \
- LDFLAGS="-L$(HOSTTOOLS)/usr/lib"
- $(Q)mkdir -p $(HOSTTOOLS)
- $(Q)mkdir -p $(HOSTTOOLS)/usr
- $(Q)mkdir -p $(HOSTTOOLS)/usr/bin
- $(Q)install $(SQUASHFS_TOOLS_BUILD_DIR)/mksquashfs $(HOSTTOOLS)/usr/bin
- $(Q)install $(SQUASHFS_TOOLS_BUILD_DIR)/unsquashfs $(HOSTTOOLS)/usr/bin
+ CPPFLAGS="-I$(embtk_htools)/usr/include" \
+ LDFLAGS="-L$(embtk_htools)/usr/lib"
+ $(Q)mkdir -p $(embtk_htools)
+ $(Q)mkdir -p $(embtk_htools)/usr
+ $(Q)mkdir -p $(embtk_htools)/usr/bin
+ $(Q)install $(SQUASHFS_TOOLS_BUILD_DIR)/mksquashfs $(embtk_htools)/usr/bin
+ $(Q)install $(SQUASHFS_TOOLS_BUILD_DIR)/unsquashfs $(embtk_htools)/usr/bin
$(Q)touch $@
squashfs_tools_clean:
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 253bf70..c7eb138 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -47,7 +47,7 @@ export ac_cv_func_malloc_0_nonnull
ac_cv_func_realloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull
-PATH := $(HOSTTOOLS)/usr/bin:$(HOSTTOOLS)/usr/sbin:$(PATH)
+PATH := $(embtk_htools)/usr/bin:$(embtk_htools)/usr/sbin:$(PATH)
export PATH
LIBDIR := $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32),lib32,lib)
diff --git a/mk/zlib_host.mk b/mk/zlib_host.mk
index dbad8f5..4399bc5 100644
--- a/mk/zlib_host.mk
+++ b/mk/zlib_host.mk
@@ -37,11 +37,11 @@ zlib_host_install:
define embtk_configure_zlib_host
$(Q)cd $(ZLIB_HOST_BUILD_DIR); \
- CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \
- LDFLAGS="-L$(HOSTTOOLS)/$(LIBDIR) -L$(HOSTTOOLS)/usr/$(LIBDIR)" \
+ CPPFLAGS="-I$(embtk_htools)/usr/include" \
+ LDFLAGS="-L$(embtk_htools)/$(LIBDIR) -L$(embtk_htools)/usr/$(LIBDIR)" \
$(ZLIB_HOST_CONFIGURE_ENV) \
$(CONFIG_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \
- --prefix=$(HOSTTOOLS)/usr $(ZLIB_HOST_CONFIGURE_OPTS)
+ --prefix=$(embtk_htools)/usr $(ZLIB_HOST_CONFIGURE_OPTS)
$(Q)touch $(ZLIB_HOST_BUILD_DIR)/.configured
endef
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:14:10 +0000