diff --git a/make/rules.mk b/make/rules.mk index eabd5706..42a4fbeb 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -308,9 +308,12 @@ $(INSTALL_SYSCFGDIR)/%: %.sysconf | $(INSTALL_SYSCFGDIR) # --- special installation rules < +#build_dir_$(1): $$(TOPDIR)/dir_build_$(1).done +# old prereq $$(TOPDIR)/dir_install_$(1).done +#$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done check_not_empty_$(1)MODE + define std_install_rules -#build_dir_$(1): $$(TOPDIR)/dir_build_$(1).done 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)) @@ -319,7 +322,6 @@ $$(TOPDIR)/dir_build_$(1).done: mkdir -p $$(BUILD_$(1)DIR) touch $$@ -#$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done check_not_empty_$(1)MODE $$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done @if [ ! $$< -ef $$@ -a "`echo $$< | sed 's/\..*//'`" != local ]; then \ echo install -m $($(1)MODE) $$< $$@ ;\ @@ -337,8 +339,6 @@ $$(TOPDIR)/dir_install_$(1).done: $$(INSTALL_$(1)DIR): $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$@ -# old prereq $$(TOPDIR)/dir_install_$(1).done - $$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR) $$(INSTALL) -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@