From 59ca1784f0bab54adb9cfd198c00aadeff386a8d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 19 Apr 2012 12:04:47 +0000 Subject: [PATCH] rules.mk: Attempt to abandon $(TOPDIR)/install_dir_XXX.done --- make/rules.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/make/rules.mk b/make/rules.mk index 5f39617a..346f25b8 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -322,8 +322,8 @@ $(INSTALL_SYSCFGDIR)/%: %.sysconf | $(INSTALL_SYSCFGDIR) define std_install_rules build_$(1): $$(TOPDIR)/dir_build_$(1).done $$(BUILD_$(1)) -install_dir_$(1): $$(TOPDIR)/dir_install_$(1).done -install_$(1): $$(TOPDIR)/dir_install_$(1).done $$(INSTALLED_$(1)) +install_dir_$(1): | $$(INSTALL_$(1)DIR) +install_$(1): install_dir_$(1) $$(INSTALLED_$(1)) $$(TOPDIR)/dir_build_$(1).done: mkdir -p $$(BUILD_$(1)DIR) @@ -340,7 +340,10 @@ $$(TOPDIR)/dir_install_$(1).done: $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) touch $$@ -$$(INSTALL_$(1)DIR)/%: % | $$(TOPDIR)/dir_install_$(1).done +$$(INSTALL_$(1)DIR): + $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) + +$$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR) $$(INSTALL) -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@ endef