Merge branch 'master' into embtk-0.1.0-rc14-dev

5 files changed, 146 insertions, 114 deletions

diff --git a/mk/macros.mk b/mk/macros.mk
index 2cf3d0e..4cf8b62 100644
--- a/mk/macros.mk
+++ b/mk/macros.mk
@@ -223,6 +223,30 @@ PKGV=$(strip $(shell echo $(1) | tr a-z A-Z))
 embtk_get_pkgversion = $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_VERSION_STRING)))
 
 #
+# A macro to test if a package is already decompressed.
+# It returns y if decompressed and nothing if not.
+#
+__embtk_pkg_decompressed-y = $(shell test -e $($(PKGV)_SRC_DIR)/.decompressed && echo y)
+
+#
+# A macro to test if a package is already patched.
+# It returns y if patched and nothing if not.
+#
+__embtk_pkg_patched-y = $(shell test -e $($(PKGV)_SRC_DIR)/.patched && echo y)
+
+#
+# A macro to test if a package is already configured using autotools configure
+# script. It returns y if configured and nothing if not.
+#
+__embtk_pkg_configured-y = $(shell test -e $($(PKGV)_BUILD_DIR)/.configured && echo y)
+
+#
+# A macro to test if a package is already installed.
+# It returns y if installed and nothing if not.
+#
+__embtk_pkg_installed-y = $(shell test -e $($(PKGV)_BUILD_DIR)/.installed && echo y)
+
+#
 # A macro which runs configure script (conpatible with autotools configure)
 # for a package and sets environment variables correctly.
 # Usage:
@@ -291,6 +315,8 @@ define embtk_configure_hostpkg
 	@cd $($(PKGV)_BUILD_DIR);						\
 	CPPFLAGS="-I$(HOSTTOOLS)/usr/include"					\
 	LDFLAGS="-L$(HOSTTOOLS)/usr/lib -Wl,-rpath,$(HOSTTOOLS)/usr/lib"	\
+	PKG_CONFIG="$(PKGCONFIG_BIN)"						\
+	PKG_CONFIG_PATH="$(EMBTK_HOST_PKG_CONFIG_PATH)"				\
 	$(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CC=$(HOSTCC_CACHED))	\
 	$(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CXX=$(HOSTCXX_CACHED))	\
 	$($(PKGV)_CONFIGURE_ENV)						\
@@ -302,64 +328,60 @@ define embtk_configure_hostpkg
 endef
 
 #
-# A macro to install automatically a package intended to run on the target.
-# Usage:
-# $(call embtk_install_pkg,PACKAGE)
+# Various helpers macros for different steps while installing packages.
 #
 __embtk_multi_make = $(foreach builddir,$($(PKGV)_MAKE_DIRS),			\
+				$($(PKGV)_MAKE_ENV)				\
 				$(MAKE) -C $($(PKGV)_BUILD_DIR)/$(builddir)	\
 				$($(PKGV)_MAKE_OPTS) $(J);)
 
-__embtk_single_make = $(MAKE) -C $($(PKGV)_BUILD_DIR) $($(PKGV)_MAKE_OPTS) $(J)
+__embtk_single_make = $($(PKGV)_MAKE_ENV) $(MAKE) -C $($(PKGV)_BUILD_DIR)	\
+			$($(PKGV)_MAKE_OPTS) $(J)
 
 __embtk_multi_make_install = $(foreach builddir,$($(PKGV)_MAKE_DIRS),		\
-	$(MAKE) -C $($(PKGV)_BUILD_DIR)/$(builddir)				\
-	DESTDIR=$(SYSROOT)/$($(PKGV)_SYSROOT_SUFFIX) $($(PKGV)_MAKE_OPTS) install;)
+	$($(PKGV)_MAKE_ENV) $(MAKE) -C $($(PKGV)_BUILD_DIR)/$(builddir)		\
+	DESTDIR=$(SYSROOT)$(if $($(PKGV)_SYSROOT_SUFFIX),/$($(PKGV)_SYSROOT_SUFFIX)) \
+	$($(PKGV)_MAKE_OPTS) install;)
 
-__embtk_single_make_install = $(MAKE) -C $($(PKGV)_BUILD_DIR)			\
-	DESTDIR=$(SYSROOT)/$($(PKGV)_SYSROOT_SUFFIX) $($(PKGV)_MAKE_OPTS) install
+__embtk_single_make_install = $($(PKGV)_MAKE_ENV)				\
+	$(MAKE) -C $($(PKGV)_BUILD_DIR)						\
+	DESTDIR=$(SYSROOT)$(if $($(PKGV)_SYSROOT_SUFFIX),/$($(PKGV)_SYSROOT_SUFFIX)) \
+	$($(PKGV)_MAKE_OPTS) install
 
 __embtk_multi_make_hostinstall = $(foreach builddir,$($(PKGV)_MAKE_DIRS),	\
+	$($(PKGV)_MAKE_ENV)							\
 	$(MAKE) -C $($(PKGV)_BUILD_DIR)/$(builddir)				\
 	$(if $($(PKGV)_DESTDIR),DESTDIR=$($(PKGV)_DESTDIR))			\
 	$($(PKGV)_MAKE_OPTS) install;)
 
-__embtk_single_make_hostinstall = $(MAKE) -C $($(PKGV)_BUILD_DIR)		\
-	$(if $($(PKGV)_DESTDIR),DESTDIR=$($(PKGV)_DESTDIR)) $($(PKGV)_MAKE_OPTS) install
+__embtk_single_make_hostinstall = $($(PKGV)_MAKE_ENV)				\
+	$(MAKE) -C $($(PKGV)_BUILD_DIR)						\
+	$(if $($(PKGV)_DESTDIR),DESTDIR=$($(PKGV)_DESTDIR))			\
+	$($(PKGV)_MAKE_OPTS) install
 
+__embtk_autotolspkg-y=$(2)
 define __embtk_install_pkg_make
 	$(call embtk_generic_msg,"Compiling and installing $($(PKGV)_NAME)-$($(PKGV)_VERSION) in your root filesystem...")
 	$(Q)$(if $(strip $($(PKGV)_DEPS)),$(MAKE) $($(PKGV)_DEPS))
 	$(Q)$(call embtk_download_pkg,$(1))
 	$(Q)$(call embtk_decompress_pkg,$(1))
-	$(Q)$(call embtk_configure_pkg,$(1))
+	$(Q)$(if $(__embtk_autotolspkg-y),$(call embtk_configure_pkg,$(1)))
 	$(Q)$(if $($(PKGV)_MAKE_DIRS),						\
 		$(__embtk_multi_make),						\
 		$(__embtk_single_make))
 	$(Q)$(if $($(PKGV)_MAKE_DIRS),						\
 		$(__embtk_multi_make_install),					\
 		$(__embtk_single_make_install))
-	$(Q)$(call __embtk_fix_libtool_files)
-	$(Q)$(call __embtk_fix_pkgconfig_files)
+	$(Q)$(if $(__embtk_autotolspkg-y),$(call __embtk_fix_libtool_files))
+	$(Q)$(if $(__embtk_autotolspkg-y),$(call __embtk_fix_pkgconfig_files))
 	@touch $($(PKGV)_BUILD_DIR)/.installed
 endef
-define embtk_install_pkg
-	@$(if $(shell test -e $($(PKGV)_BUILD_DIR)/.installed && echo y),true,	\
-		$(call __embtk_install_pkg_make,$(1)))
-endef
-
-#
-# A macro to install automatically a package intended to run on the host
-# development machine.
-# Usage:
-# $(call embtk_install_hostpkg,PACKAGE)
-#
 define __embtk_install_hostpkg_make
 	$(call embtk_generic_msg,"Compiling and installing $($(PKGV)_NAME)-$($(PKGV)_VERSION) for host...")
 	$(Q)$(if $(strip $($(PKGV)_DEPS)),$(MAKE) $($(PKGV)_DEPS))
 	$(Q)$(call embtk_download_pkg,$(1))
 	$(Q)$(call embtk_decompress_hostpkg,$(1))
-	$(Q)$(call embtk_configure_hostpkg,$(1))
+	$(Q)$(if $(__embtk_autotolspkg-y),$(call embtk_configure_hostpkg,$(1)))
 	$(Q)$(if $($(PKGV)_MAKE_DIRS),						\
 		$(__embtk_multi_make),						\
 		$(__embtk_single_make))
@@ -368,8 +390,48 @@ define __embtk_install_hostpkg_make
 		$(__embtk_single_make_hostinstall))
 	@touch $($(PKGV)_BUILD_DIR)/.installed
 endef
+
+#
+# A macro to install automatically a package, using autotools scripts, intended
+# to run on the target
+# Usage:
+# $(call embtk_install_pkg,package)
+#
+define embtk_install_pkg
+	$(Q)$(if $(__embtk_pkg_installed-y),					\
+		true,$(call __embtk_install_pkg_make,$(1),autotools))
+endef
+
+#
+# A macro to install automatically a package, using simple Makefile and an
+# install target, intented to run on the target.
+# Usage:
+# $(call embtk_makeinstall_pkg,package)
+#
+define embtk_makeinstall_pkg
+	$(Q)$(if $(__embtk_pkg_installed-y),					\
+		true,$(call __embtk_install_pkg_make,$(1)))
+endef
+
+#
+# A macro to install automatically a package, using autotools scripts, intended
+# to run on the host development machine.
+# Usage:
+# $(call embtk_install_hostpkg,package)
+#
 define embtk_install_hostpkg
-	@$(if $(shell test -e $($(PKGV)_BUILD_DIR)/.installed && echo y),true,	\
+	$(Q)$(if $(__embtk_pkg_installed-y),true,	\
+		$(call __embtk_install_hostpkg_make,$(1),autotools))
+endef
+
+#
+# A macro to install automatically a package, using simple Makefile and an
+# install target, intended to run on the host development machine.
+# Usage:
+# $(call embtk_makeinstall_hostpkg,package)
+#
+define embtk_makeinstall_hostpkg
+	$(Q)$(if $(__embtk_pkg_installed-y),true,	\
 		$(call __embtk_install_hostpkg_make,$(1)))
 endef
 
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index cad8251..10dd73c 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -23,12 +23,14 @@
 # \date         June 2009
 ################################################################################
 
-MTDUTILS_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_MTDUTILS_VERSION_STRING)))
-MTDUTILS_SITE := ftp://ftp.infradead.org/pub/mtd-utils
-MTDUTILS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/mtd-utils/$(MTDUTILS_VERSION)
-MTDUTILS_PACKAGE := mtd-utils-$(MTDUTILS_VERSION).tar.bz2
-MTDUTILS_HOST_BUILD_DIR := $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
-MTDUTILS_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_NAME			:= mtd-utils
+MTDUTILS_VERSION		:= $(call embtk_get_pkgversion,mtdutils)
+MTDUTILS_SITE			:= ftp://ftp.infradead.org/pub/mtd-utils
+MTDUTILS_SITE_MIRROR3		:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+MTDUTILS_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/mtd-utils/$(MTDUTILS_VERSION)
+MTDUTILS_PACKAGE		:= mtd-utils-$(MTDUTILS_VERSION).tar.bz2
+MTDUTILS_SRC_DIR		:= $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_BUILD_DIR		:= $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
 
 MTDUTILS_SBINS := bin2nand flash_eraseall flash_unlock mkfs.jffs2 nand2bin \
 		nftl_format rfddump ubicrc32 ubimirror ubirmvol docfdisk \
@@ -40,84 +42,50 @@ MTDUTILS_SBINS := bin2nand flash_eraseall flash_unlock mkfs.jffs2 nand2bin \
 		ubinize unubi flash_erase flash_otp_info mkbootenv mtdinfo \
 		nftldump recv_image ubiattach ubigen ubirename
 
-##############################################
-# mtd-utils for the host development machine #
-##############################################
+MTDUTILS_DEPS		:= zlib_install lzo_install e2fsprogs_install
+MTDUTILS_MAKE_ENV	:= LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib"
+MTDUTILS_MAKE_ENV	+= CPPFLAGS="-I. -I./include -I$(SYSROOT)/usr/include"
+MTDUTILS_MAKE_ENV	+= CFLAGS="$(TARGET_CFLAGS)"
+MTDUTILS_MAKE_ENV	+= BUILDDIR=$(MTDUTILS_BUILD_DIR)
+MTDUTILS_MAKE_ENV	+= DESTDIR=$(SYSROOT)
+MTDUTILS_MAKE_ENV	+= PATH=$(PATH):$(TOOLS)/bin CROSS=$(CROSS_COMPILE)
 
-MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install \
-		e2fsprogs_host_install
+mtdutils_install:
+	$(call embtk_makeinstall_pkg,mtdutils)
 
-mtdutils_host_install:
-	@test -e $(MTDUTILS_HOST_BUILD_DIR)/.installed || \
-	$(MAKE) $(MTDUTILS_HOST_BUILD_DIR)/.installed
-
-$(MTDUTILS_HOST_BUILD_DIR)/.installed:  $(MTDUTILS_HOST_DEPS) \
-	download_mtdutils $(MTDUTILS_HOST_BUILD_DIR)/.decompressed
-	LDFLAGS="-L$(HOSTTOOLS)/usr/lib -L$(HOSTTOOLS)/usr/local/lib" \
-	CPPFLAGS="-I. -Iinclude -I../include -I$(HOSTTOOLS)/usr/include -I$(HOSTTOOLS)/usr/local/include" \
-	DESTDIR=$(HOSTTOOLS) \
-	BUILDDIR=$(MTDUTILS_HOST_BUILD_DIR) \
-	$(MAKE) -C $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION) install
-	@touch $@
-
-$(MTDUTILS_HOST_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(MTDUTILS_PACKAGE)...")
-	@tar -C $(TOOLS_BUILD) -xvf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
-ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
-	cd $(MTDUTILS_HOST_BUILD_DIR); \
-	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch
-endif
-	@touch $@
-
-mtdutils_host_clean:
-	$(call embtk_generic_message,"Cleaning mtd-utils in host ...")
-
-########################
-# mtd-utils for target #
-########################
+mtdutils_clean:
+	$(call embtk_cleanup_pkg,mtdutils)
 
-MTDUTILS_DEPS := zlib_install lzo_install e2fsprogs_install
+#
+# mtd-utils for host development machine.
+#
+MTDUTILS_HOST_NAME		:= $(MTDUTILS_NAME)
+MTDUTILS_HOST_VERSION		:= $(MTDUTILS_VERSION)
+MTDUTILS_HOST_SITE		:= $(MTDUTILS_SITE)
+MTDUTILS_HOST_SITE_MIRROR1	:= $(MTDUTILS_SITE_MIRROR1)
+MTDUTILS_SITE_MIRROR2		:= $(MTDUTILS_SITE_MIRROR2)
+MTDUTILS_HOST_SITE_MIRROR3	:= $(MTDUTILS_SITE_MIRROR3)
+MTDUTILS_HOST_PATCH_SITE	:= $(MTDUTILS_PATCH_SITE)
+MTDUTILS_HOST_PACKAGE		:= $(MTDUTILS_PACKAGE)
+MTDUTILS_HOST_SRC_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
 
-mtdutils_target_install:
-	@test -e $(MTDUTILS_TARGET_BUILD_DIR)/.installed || \
-	$(MAKE) $(MTDUTILS_TARGET_BUILD_DIR)/.installed
+MTDUTILS_HOST_DEPS	:= zlib_host_install lzo_host_install \
+			e2fsprogs_host_install
 
-$(MTDUTILS_TARGET_BUILD_DIR)/.installed: $(MTDUTILS_DEPS) download_mtdutils \
-	$(MTDUTILS_TARGET_BUILD_DIR)/.decompressed
-	LDFLAGS="-L$(SYSROOT)/usr/local/lib" \
-	CPPFLAGS="-I. -I./include -I$(SYSROOT)/usr/local/include -I$(SYSROOT)/usr/include" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	BUILDDIR=$(MTDUTILS_TARGET_BUILD_DIR) DESTDIR=$(SYSROOT) \
-	PATH=$(PATH):$(TOOLS)/bin CROSS=$(CROSS_COMPILE) \
-	$(MAKE) -C $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION) install
-	@touch $@
+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	+= BUILDDIR=$(MTDUTILS_HOST_BUILD_DIR)
 
-$(MTDUTILS_TARGET_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(MTDUTILS_PACKAGE)...")
-	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
-ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
-	@cd $(MTDUTILS_TARGET_BUILD_DIR); \
-	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch
-endif
-	@touch $@
+mtdutils_host_install:
+	$(call embtk_makeinstall_hostpkg,mtdutils_host)
 
-mtdutils_target_clean:
-	$(call embtk_generic_message,"Cleaning mtd-utils in target ...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(MTDUTILS_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(MTDUTILS_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(MTDUTILS_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(MTDUTILS_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(MTDUTILS_PKGCONFIGS)
-	$(Q)-rm -rf $(MTDUTILS_TARGET_BUILD_DIR)*
+mtdutils_host_clean:
+	$(call embtk_generic_msg,"Cleaning mtd-utils on host ...")
 
-download_mtdutils:
-	$(call embtk_generic_message,"Downloading $(MTDUTILS_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) \
-	$(MTDUTILS_SITE)/$(MTDUTILS_PACKAGE)
-ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
-	@test -e $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch || \
-	wget -O $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch \
-	$(MTDUTILS_PATCH_SITE)/mtd-utils-$(MTDUTILS_VERSION)-*.patch
-endif
+#
+# Common for host and target.
+#
+download_mtdutils download_mtdutils_host:
+	$(call embtk_download_pkg,mtdutils)
diff --git a/mk/packages.mk b/mk/packages.mk
index 8789052..bfb8ccd 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -23,13 +23,14 @@
 # \date         May 2009
 ################################################################################
 
-ROOTFS_COMPONENTS-y :=
-HOSTTOOLS_COMPONENTS-y := mkimage_install
+ROOTFS_COMPONENTS-y		:=
+HOSTTOOLS_COMPONENTS-y		:= mkimage_install pkgconfig_install
 ################################################################################
 #################### Common include for target and host ########################
 ################################################################################
 include $(EMBTK_ROOT)/mk/mkimage.mk
 include $(EMBTK_ROOT)/mk/mtd-utils.mk
+include $(EMBTK_ROOT)/mk/pkgconfig.mk
 
 ################################################################################
 ######################### Packages for TARGET and HOST #########################
@@ -40,7 +41,7 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_STRACE) += strace_install
 include $(EMBTK_ROOT)/mk/strace.mk
 
 # Flash manipulation tools: mtd-utils
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS) += mtdutils_target_install
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_MTDUTILS) += mtdutils_install
 
 #Compression packages
 include $(EMBTK_ROOT)/packages/compression/compression.mk
@@ -84,7 +85,7 @@ ROOTFS_COMPONENTS_CLEAN := $(subst install,clean,$(ROOTFS_COMPONENTS-))
 host_packages_build:
 ifeq ($(HOSTTOOLS_COMPONENTS-y),)
 else
-	$(call embtk_generic_message,"Building extra packages intended to run \
+	$(call embtk_generic_msg,"Building extra packages intended to run \
 	on your host machine ...")
 	@$(MAKE) $(HOSTTOOLS_COMPONENTS-y)
 endif
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index 0cf4852..3ab70de 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -32,11 +32,13 @@ PKGCONFIG_PACKAGE	:= pkg-config-$(PKGCONFIG_VERSION).tar.gz
 PKGCONFIG_SRC_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
 PKGCONFIG_BUILD_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
 
-PKGCONFIG_BIN		:= $(HOSTTOOLS)/usr/bin/pkg-config
-EMBTK_PKG_CONFIG_PATH	:= $(SYSROOT)/usr/$(LIBDIR)/pkgconfig
-EMBTK_PKG_CONFIG_LIBDIR	:= $(SYSROOT)/usr/$(LIBDIR)
+PKGCONFIG_BIN			:= $(HOSTTOOLS)/usr/bin/pkg-config
+EMBTK_PKG_CONFIG_PATH		:= $(SYSROOT)/usr/$(LIBDIR)/pkgconfig
+EMBTK_PKG_CONFIG_LIBDIR		:= $(SYSROOT)/usr/$(LIBDIR)/pkgconfig
+EMBTK_HOST_PKG_CONFIG_PATH	:= $(HOSTTOOLS)/usr/lib/pkgconfig:/usr/lib/pkgconfig
 
 export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR
+export EMBTK_HOST_PKG_CONFIG_PATH
 
 PKGCONFIG_PREFIX	:= /usr
 PKGCONFIG_DESTDIR	:= $(HOSTTOOLS)
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 1f7bebf..b7fcc5a 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -35,8 +35,7 @@ include $(EMBTK_ROOT)/mk/fs.mk
 #host tools in order to build root filesystems: fakeroot and makedevs.
 include $(EMBTK_ROOT)/mk/fakeroot.mk
 include $(EMBTK_ROOT)/mk/makedevs.mk
-include $(EMBTK_ROOT)/mk/pkgconfig.mk
-ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install pkgconfig_install
+ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install
 
 #Does CPIO archive for initramfs selected?
 FILESYSTEMS-$(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO) += build_initramfs_archive