- replace mkdir with install

4 years ago · 8af5c0fe4a
15 changed files with 77 additions and 78 deletions
--- a/make/buildsystem-bootstrap.mk
+++ b/make/buildsystem-bootstrap.mk
@ -39,29 +39,29 @@ skeleton: | $(TARGET_DIR)
 # -----------------------------------------------------------------------------

 target-dir:
-	mkdir -p $(TARGET_DIR)
-	mkdir -p $(TARGET_bindir)
-	mkdir -p $(TARGET_includedir)
-	mkdir -p $(TARGET_libdir)
-	mkdir -p $(TARGET_sbindir)
-	mkdir -p $(TARGET_datadir)
-	#mkdir -p $(TARGET_prefix)/local/{bin,include,lib,sbin,share}
-	mkdir -p $(TARGET_localstatedir)/bin
-	mkdir -p $(TARGET_localstatedir)/etc/init.d
-	mkdir -p $(TARGET_localstatedir)/keys
-	mkdir -p $(TARGET_localstatedir)/root
+	$(INSTALL) -d $(TARGET_DIR)
+	$(INSTALL) -d $(TARGET_bindir)
+	$(INSTALL) -d $(TARGET_includedir)
+	$(INSTALL) -d $(TARGET_libdir)
+	$(INSTALL) -d $(TARGET_sbindir)
+	$(INSTALL) -d $(TARGET_datadir)
+	#$(INSTALL) -d $(TARGET_prefix)/local/{bin,include,lib,sbin,share}
+	$(INSTALL) -d $(TARGET_localstatedir)/bin
+	$(INSTALL) -d $(TARGET_localstatedir)/etc/init.d
+	$(INSTALL) -d $(TARGET_localstatedir)/keys
+	$(INSTALL) -d $(TARGET_localstatedir)/root
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
-	mkdir -p $(TARGET_DIR)/boot
+	$(INSTALL) -d $(TARGET_DIR)/boot
 endif
-	mkdir -p $(TARGET_DIR)/dev
-	mkdir -p $(TARGET_DIR)/home
-	mkdir -p $(TARGET_DIR)/media
-	mkdir -p $(TARGET_DIR)/mnt
-	mkdir -p $(TARGET_DIR)/proc
-	mkdir -p $(TARGET_DIR)/srv
-	mkdir -p $(TARGET_DIR)/sys
-	mkdir -p $(TARGET_DIR)/tmp
-	$(foreach dir,$(subst :, ,$(PKG_CONFIG_PATH)),$(shell mkdir -p $(dir)))
+	$(INSTALL) -d $(TARGET_DIR)/dev
+	$(INSTALL) -d $(TARGET_DIR)/home
+	$(INSTALL) -d $(TARGET_DIR)/media
+	$(INSTALL) -d $(TARGET_DIR)/mnt
+	$(INSTALL) -d $(TARGET_DIR)/proc
+	$(INSTALL) -d $(TARGET_DIR)/srv
+	$(INSTALL) -d $(TARGET_DIR)/sys
+	$(INSTALL) -d $(TARGET_DIR)/tmp
+	$(foreach dir,$(subst :, ,$(PKG_CONFIG_PATH)),$(shell $(INSTALL) -d $(dir)))
 	make skeleton
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
  ifeq ($(IMAGE_NEW),yes)
@ -85,7 +85,7 @@ $(BUILD_DIR) \
 $(STAGING_DIR) \
 $(IMAGE_DIR) \
 $(UPDATE_DIR):
-	mkdir -p $(@)
+	$(INSTALL) -d $(@)

 # -----------------------------------------------------------------------------

@ -111,7 +111,7 @@ ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream))
 var-update: $(TARGET_localstatedir)/update

 $(TARGET_localstatedir)/update: | $(TARGET_DIR)
-	mkdir -p $(@)
+	$(INSTALL) -d $(@)
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2))
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/uldr.bin $(@)
  ifeq ($(BOXMODEL),kronos_v2)
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@ -14,14 +14,6 @@ UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR)
 REMOVE = rm -rf $(BUILD_DIR)

 # build helper variables
-CD    = set -e; cd
-CHDIR = $(CD) $(BUILD_DIR)
-MKDIR = mkdir -p $(BUILD_DIR)
-CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
-#TOUCH = @touch $(DEPS_DIR)/$(@)
-TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
-SED   = $(shell which sed || type -p sed) -i -e
-
 INSTALL      = install
 INSTALL_DATA = $(INSTALL) -m 0644
 INSTALL_EXEC = $(INSTALL) -m 0755
@ -34,6 +26,13 @@ define INSTALL_EXIST # (source, dest)
 	fi
 endef

+CD    = set -e; cd
+CHDIR = $(CD) $(BUILD_DIR)
+MKDIR = $(INSTALL) -d $(BUILD_DIR)
+CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
+TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
+SED   = $(shell which sed || type -p sed) -i -e
+
 GET-GIT-ARCHIVE = support/scripts/get-git-archive.sh
 GET-GIT-SOURCE  = support/scripts/get-git-source.sh
 GET-SVN-SOURCE  = support/scripts/get-svn-source.sh
--- a/make/buildsystem-prerequisites.mk
+++ b/make/buildsystem-prerequisites.mk
@ -66,7 +66,7 @@ download:
 # -----------------------------------------------------------------------------

 $(SOURCE_DIR):
-	mkdir -p $(@)
+	$(INSTALL) -d $(@)

 $(BUILD_GENERIC_PC):
 	git clone $(NI_PUBLIC)/$(NI_BUILD_GENERIC_PC).git $(BUILD_GENERIC_PC)
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@ -389,7 +389,7 @@ CMAKE = $(TARGET_CMAKE)
 # -----------------------------------------------------------------------------

 define meson-cross-config # (dest dir)
-	mkdir -p $(1)
+	$(INSTALL) -d $(1)
 	( \
 		echo "# Note: Buildsystems's and Meson's terminologies differ about the meaning"; \
 		echo "# of 'build', 'host' and 'target':"; \
--- a/make/environment-target.mk
+++ b/make/environment-target.mk
@ -116,7 +116,7 @@ $(SHARE_WEBRADIO) \
 $(SHARE_WEBTV) \
 $(VAR_CONFIG) \
 $(VAR_PLUGINS) : | $(TARGET_DIR)
-	mkdir -p $(@)
+	$(INSTALL) -d $(@)

 # -----------------------------------------------------------------------------

--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@ -122,7 +122,7 @@ endif
 flash-image-hd5x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-hd5x: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@ -179,7 +179,7 @@ STORAGE_PARTITION_OFFSET = "$(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LIN

 flash-image-hd5x-multi: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)
 	# Create a sparse image block
 	dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
 	mkfs.ext4 -v -F $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/..
@ -214,7 +214,7 @@ flash-image-hd5x-multi: | $(IMAGE_DIR)
 	# Truncate on purpose
 	dd if=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
 	# Create final USB-image
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(EMMC_IMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(SUPPORT_DIR)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash.bin
 	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin
@ -231,7 +231,7 @@ flash-image-hd5x-multi: | $(IMAGE_DIR)
 flash-image-hd6x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-hd6x: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/uImage
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@ -277,7 +277,7 @@ flash-image-hd6x-multi-recovery: $(DL_DIR)/$(HD6x_PARTITONS_SOURCE)
 flash-image-hd6x-multi-recovery: $(DL_DIR)/$(HD6x_RECOVERY_SOURCE)
 flash-image-hd6x-multi-recovery: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	unzip -o $(DL_DIR)/$(HD6x_BOOTARGS_SOURCE) -d $(IMAGE_BUILD_DIR)
 	unzip -o $(DL_DIR)/$(HD6x_PARTITONS_SOURCE) -d $(IMAGE_BUILD_DIR)
 	unzip -o $(DL_DIR)/$(HD6x_RECOVERY_SOURCE) -d $(IMAGE_BUILD_DIR)
@ -339,7 +339,7 @@ flash-image-hd6x-multi-recovery: | $(IMAGE_DIR)
 flash-image-hd6x-single: flash-image-hd6x-multi-recovery
 flash-image-hd6x-single: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/uImage
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@ -358,7 +358,7 @@ flash-image-hd6x-single: | $(IMAGE_DIR)
 flash-image-vuplus: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-vuplus: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@ -374,7 +374,7 @@ flash-image-vuplus: | $(IMAGE_DIR)
 flash-image-vuplus-multi: vmlinuz-initrd
 flash-image-vuplus-multi: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
+	$(INSTALL) -d $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(SUPPORT_DIR)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin
 	cp $(BUILD_DIR)/$(VMLINUZ_INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin
 	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
--- a/make/flash-updates.mk
+++ b/make/flash-updates.mk
@ -70,7 +70,7 @@ endif
 u-update.urls: update.urls
 	$(MAKE) u-init
 	echo "wget -q "http://localhost/control/message?popup=update.urls%20installed." -O /dev/null"	>> $(POSTINSTALL_SH)
-	mkdir -pv $(UPDATE_INST_DIR)/var/etc
+	$(INSTALL) -d $(UPDATE_INST_DIR)/var/etc
 	cp -f $(TARGET_localstatedir)/etc/update.urls $(UPDATE_INST_DIR)/var/etc/
 	$(MAKE) u-update-bin \
 			UPDATE_NAME=update.urls \
@ -82,13 +82,13 @@ u-pr-auto-timer:
 	$(MAKE) u-init
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
-	mkdir -p $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
+	$(INSTALL) -d $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config
+	$(INSTALL) -d $(UPDATE_INST_DIR)/var/tuxbox/config
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
@ -113,7 +113,7 @@ matze-192-130:
 	$(MAKE) u-init
 	$(INSTALL_EXEC) $(PACKAGE_DIR)/channellists/files/update-ctrl/preinstall.sh $(PREINSTALL_SH)
 	$(INSTALL_EXEC) $(PACKAGE_DIR)/channellists/files/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
-	mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config/zapit
+	$(INSTALL) -d $(UPDATE_INST_DIR)/var/tuxbox/config/zapit
 	$(INSTALL_COPY) $(PACKAGE_DIR)/channellists/files/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
 	# remove non-printable chars and re-format xml-files
 	$(CD) $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/; \
@ -183,8 +183,8 @@ u-custom:
 # -----------------------------------------------------------------------------

 u-init: u-clean | $(UPDATE_DIR)
-	mkdir -p $(UPDATE_INST_DIR)
-	mkdir -p $(UPDATE_CTRL_DIR)
+	$(INSTALL) -d $(UPDATE_INST_DIR)
+	$(INSTALL) -d $(UPDATE_CTRL_DIR)
 	echo -e "#!/bin/sh\n#"	> $(PREINSTALL_SH)
 	chmod 0755 $(PREINSTALL_SH)
 	echo -e "#!/bin/sh\n#"	> $(POSTINSTALL_SH)
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@ -4,9 +4,9 @@
 # -----------------------------------------------------------------------------

 $(HOST_DIR):
-	mkdir -p $(HOST_DIR)
-	mkdir -p $(HOST_DIR)/bin
-	mkdir -p $(HOST_DEPS_DIR)
+	$(INSTALL) -d $(HOST_DIR)
+	$(INSTALL) -d $(HOST_DIR)/bin
+	$(INSTALL) -d $(HOST_DEPS_DIR)

 # -----------------------------------------------------------------------------

--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@ -292,9 +292,9 @@ STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/cifs/cifs.ko
 STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/fuse/fuse.ko

 kernel-modules-coolstream-hd1: kernel-coolstream
-	mkdir -p $(TARGET_modulesdir)
+	$(INSTALL) -d $(TARGET_modulesdir)
 	for module in $(STRIP_MODULES_COOLSTREAM_HD1); do \
-		mkdir -p $(TARGET_modulesdir)/$$(dirname $$module); \
+		$(INSTALL) -d $(TARGET_modulesdir)/$$(dirname $$module); \
 		$(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_modulesdir)/$$module $(TARGET_modulesdir)/$$module; \
 	done;
 	rm -f $(TARGET_modulesdir)/usb-storage.ko # already builtin
@ -303,7 +303,7 @@ kernel-modules-coolstream-hd1: kernel-coolstream
 	$(TOUCH)

 kernel-modules-coolstream-hd2: kernel-coolstream
-	mkdir -p $(TARGET_modulesdir)
+	$(INSTALL) -d $(TARGET_modulesdir)
 	$(INSTALL_COPY) $(KERNEL_modulesdir)/kernel $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.builtin $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir)
@ -312,7 +312,7 @@ kernel-modules-coolstream-hd2: kernel-coolstream
 	$(TOUCH)

 kernel-modules-armbox: kernel-armbox
-	mkdir -p $(TARGET_modulesdir)
+	$(INSTALL) -d $(TARGET_modulesdir)
 	$(INSTALL_COPY) $(KERNEL_modulesdir)/kernel $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.builtin $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir)
@ -328,7 +328,7 @@ endif
 	$(TOUCH)

 kernel-modules-mipsbox: kernel-mipsbox
-	mkdir -p $(TARGET_modulesdir)
+	$(INSTALL) -d $(TARGET_modulesdir)
 	$(INSTALL_COPY) $(KERNEL_modulesdir)/kernel $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.builtin $(TARGET_modulesdir)
 	$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir)
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@ -144,13 +144,13 @@ shiner-drivers \
 kronos-drivers \
 kronos_v2-drivers \
 coolstream-drivers: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
-	mkdir -p $(TARGET_libdir)
+	$(INSTALL) -d $(TARGET_libdir)
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib/. $(TARGET_libdir)
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf libnxp.so $(TARGET_libdir)/libconexant.so
 endif
-	mkdir -p $(TARGET_modulesdir)
+	$(INSTALL) -d $(TARGET_modulesdir)
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-modules/$(KERNEL_VERSION)/. $(TARGET_modulesdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf $(KERNEL_VERSION) $(TARGET_modulesdir)-$(BOXMODEL)
@ -161,14 +161,14 @@ endif
 hd51-drivers \
 bre2ze4k-drivers \
 h7-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
-	mkdir -p $(TARGET_modulesdir)/extra
+	$(INSTALL) -d $(TARGET_modulesdir)/extra
 	unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
 	$(LINUX_RUN_DEPMOD)
 	$(TOUCH)

 hd60-drivers \
 hd61-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
-	mkdir -p $(TARGET_modulesdir)/extra
+	$(INSTALL) -d $(TARGET_modulesdir)/extra
 	unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
 	rm -f $(TARGET_modulesdir)/extra/hi_play.ko
 	mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir)
@ -184,7 +184,7 @@ vuuno4k-drivers \
 vuuno4kse-drivers \
 vuduo-drivers \
 vuplus-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
-	mkdir -p $(TARGET_modulesdir)/extra
+	$(INSTALL) -d $(TARGET_modulesdir)/extra
 	tar -xf $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra
 	$(LINUX_RUN_DEPMOD)
 	$(TOUCH)
@ -337,7 +337,7 @@ hd60-libs \
 hd61-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BOXMODEL_LIBS_DIR)
 	unzip -o $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)
-	mkdir -p $(TARGET_libdir)/hisilicon
+	$(INSTALL) -d $(TARGET_libdir)/hisilicon
 	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon
 	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon
 	ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_libdir)/hisilicon/ld-linux.so
--- a/make/target-neutrino-plugins.mk
+++ b/make/target-neutrino-plugins.mk
@ -93,7 +93,7 @@ endif
 # -----------------------------------------------------------------------------

 $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO_PLUGINS_DEPENDENCIES)
-	test -d $(NEUTRINO_PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO_PLUGINS_BUILD_DIR)
+	test -d $(NEUTRINO_PLUGINS_BUILD_DIR) || $(INSTALL) -d $(NEUTRINO_PLUGINS_BUILD_DIR)
 	$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/autogen.sh
 	$(CD) $(NEUTRINO_PLUGINS_BUILD_DIR); \
 		$(NEUTRINO_PLUGINS_CONF_ENV) \
@ -169,9 +169,9 @@ neutrino-plugin-%: $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status

 channellogos: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_ICONS)
 	rm -rf $(SHARE_LOGOS)
-	mkdir -p $(SHARE_LOGOS)
+	$(INSTALL) -d $(SHARE_LOGOS)
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos/* $(SHARE_LOGOS)
-	mkdir -p $(SHARE_LOGOS)/events
+	$(INSTALL) -d $(SHARE_LOGOS)/events
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos-events/* $(SHARE_LOGOS)/events
 	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-links; \
 		./logo-linker.sh logo-links.db $(SHARE_LOGOS)
--- a/make/target-neutrino.mk
+++ b/make/target-neutrino.mk
@ -175,7 +175,7 @@ endif
 # -----------------------------------------------------------------------------

 $(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPENDENCIES)
-	test -d $(NEUTRINO_BUILD_DIR) || mkdir -p $(NEUTRINO_BUILD_DIR)
+	test -d $(NEUTRINO_BUILD_DIR) || $(INSTALL) -d $(NEUTRINO_BUILD_DIR)
 	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		git checkout $(NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh
@ -227,7 +227,7 @@ endif
 # -----------------------------------------------------------------------------

 $(LIBSTB_HAL_BUILD_DIR)/config.status: $(LIBSTB_HAL_DEPENDENCIES)
-	test -d $(LIBSTB_HAL_BUILD_DIR) || mkdir -p $(LIBSTB_HAL_BUILD_DIR)
+	test -d $(LIBSTB_HAL_BUILD_DIR) || $(INSTALL) -d $(LIBSTB_HAL_BUILD_DIR)
 	$(SOURCE_DIR)/$(NI_LIBSTB_HAL)/autogen.sh
 	$(CD) $(LIBSTB_HAL_BUILD_DIR); \
 		$(LIBSTB_HAL_CONF_ENV) \
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@ -49,23 +49,23 @@ ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(CD) $(TARGET_sysconfdir); \
 		ln -sf /var/etc/hostname hostname
 endif
-	mkdir -p $(TARGET_localstatedir)/tuxbox/config
+	$(INSTALL) -d $(TARGET_localstatedir)/tuxbox/config
 	$(CD) $(TARGET_localstatedir)/tuxbox/config; \
 		ln -sf /var/keys/SoftCam.Key SoftCam.Key

 # -----------------------------------------------------------------------------

 e2-multiboot: .version | $(TARGET_DIR)
-	mkdir -p $(TARGET_bindir)
+	$(INSTALL) -d $(TARGET_bindir)
 	echo -e "#!/bin/sh\necho Nope!" > $(TARGET_bindir)/enigma2
 	chmod 0755 $(TARGET_bindir)/enigma2
 	#
 	echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_sysconfdir)/issue
 	#
-	mkdir -p $(TARGET_datadir)
+	$(INSTALL) -d $(TARGET_datadir)
 	touch $(TARGET_datadir)/bootlogo.mvi
 	#
-	mkdir -p $(TARGET_localstatedir)/lib/opkg
+	$(INSTALL) -d $(TARGET_localstatedir)/lib/opkg
 	touch $(TARGET_localstatedir)/lib/opkg/status
 	#
 	$(INSTALL_DATA) $(TARGET_DIR)/.version $(TARGET_sysconfdir)/image-version
@ -89,7 +89,7 @@ rootfs: target-finish $(ROOTFS) rootfs-cleanup rootfs-strip
 # create filesystem for our images
 $(ROOTFS): | $(TARGET_DIR)
 	rm -rf $(ROOTFS)
-	mkdir -p $(dir $(ROOTFS))
+	$(INSTALL) -d $(dir $(ROOTFS))
 	$(INSTALL_COPY) $(TARGET_DIR) $(ROOTFS)

 # -----------------------------------------------------------------------------
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@ -107,7 +107,7 @@ shadow: $(DL_DIR)/$(SHADOW_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(SED) 's|SHELL=.*|SHELL=/bin/sh|' $(TARGET_sysconfdir)/default/useradd
-	mkdir -p $(TARGET_sysconfdir)/skel
+	$(INSTALL) -d $(TARGET_sysconfdir)/skel
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@ -1104,7 +1104,7 @@ vsftpd: $(VSFTPD_DEPENDENCIES) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 		$(MAKE) clean; \
 		$(MAKE) $(TARGET_CONFIGURE_ENV) LIBS="$($(PKG)_LIBS)"; \
 		$(INSTALL_EXEC) -D vsftpd $(TARGET_sbindir)/vsftpd
-	mkdir -p $(TARGET_datadir)/empty
+	$(INSTALL) -d $(TARGET_datadir)/empty
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/vsftpd.conf $(TARGET_sysconfdir)/vsftpd.conf
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/vsftpd.chroot_list $(TARGET_sysconfdir)/vsftpd.chroot_list
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/vsftpd.init $(TARGET_sysconfdir)/init.d/vsftpd
@ -1293,7 +1293,7 @@ samba33: $(SAMBA33_DEPENDENCIES) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 		$(CONFIGURE); \
 		$(MAKE1) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGET_localstatedir)/samba/locks
+	$(INSTALL) -d $(TARGET_localstatedir)/samba/locks
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/samba3.init $(TARGET_sysconfdir)/init.d/samba
 	$(UPDATE-RC.D) samba defaults 75 25
@ -1363,7 +1363,7 @@ samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGET_localstatedir)/samba/locks
+	$(INSTALL) -d $(TARGET_localstatedir)/samba/locks
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/samba3.init $(TARGET_sysconfdir)/init.d/samba
 	$(UPDATE-RC.D) samba defaults 75 25
@ -1415,7 +1415,7 @@ dropbear: $(DROPBEAR_DEPENDENCIES) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 		echo '#define DEFAULT_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/var/bin"' >> localoptions.h; \
 		$(MAKE) $($(PKG)_MAKE_OPTS) SCPPROGRESS=1; \
 		$(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGET_sysconfdir)/dropbear
+	$(INSTALL) -d $(TARGET_sysconfdir)/dropbear
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/dropbear.init $(TARGET_sysconfdir)/init.d/dropbear
 	$(UPDATE-RC.D) dropbear defaults 75 25
 	$(REMOVE)/$(PKG_DIR)
@ -1572,7 +1572,7 @@ xupnpd: $(XUPNPD_DEPENDENCIES) | $(TARGET_DIR)
 		$(TARGET_CONFIGURE_ENV) \
 		$(MAKE) -C src $($(PKG)_MAKE_OPTS) embedded ; \
 		$(INSTALL_EXEC) -D src/xupnpd $(TARGET_bindir)/xupnpd; \
-		mkdir -p $(TARGET_datadir)/xupnpd/config; \
+		$(INSTALL) -d $(TARGET_datadir)/xupnpd/config; \
 		$(INSTALL_COPY) src/{plugins,profiles,ui,www,*.lua} $(TARGET_datadir)/xupnpd/
 	rm $(TARGET_datadir)/xupnpd/plugins/staff/xupnpd_18plus.lua
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_datadir)/xupnpd/plugins/