diff --git a/make/defs.mk b/make/defs.mk index 8b416b55..2d135613 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -404,7 +404,8 @@ INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) # -- MAKE INSTALLATION_FILE_TYPES += MAKE -BUILD_MAKEDIR = $(TOPDIR)/make +#BUILD_MAKEDIR is currently not used anywhere and costs performance. Disabled for the time being. +#BUILD_MAKEDIR = $(TOPDIR)/make MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) INSTALL_MAKEDIR ?= $(PREFIX)/make INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) diff --git a/make/rules.mk b/make/rules.mk index bbdadda3..0179fbbb 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -390,12 +390,14 @@ $$(TOPDIR)/dir_install_$(1).done: mkdir -p $$(INSTALL_$(1)DIR) touch $$@ +ifneq ($$(BUILD_$(1)DIR),) $$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done $(Q)if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \ echo $(BIN_INSTALL) -D -p -m $($(1)MODE) $$< $$@ ;\ $(BIN_INSTALL) -D -p -m $($(1)MODE) $$< $$@ ;\ $(RM) -f $$(TOPDIR)/dirs-*.done ;\ fi +endif $$(INSTALL_$(1)DIR): ifeq ($(PACKAGE_INSTALL_DIR),true)