rules.mk: Attempt to abandon $(TOPDIR)/install_dir_XXX.done

This commit is contained in:
Jan Lindemann 2012-04-19 12:04:47 +00:00 committed by Jan Lindemann
commit 59ca1784f0

View file

@ -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