autoconf.cfg: recognize correctly quad-core models of Intel Xeon cpus

[libucw.git] / build / Makebottom

diff --git a/build/Makebottom b/build/Makebottom
index a474614bb2817c9f93e6310c22b347d443a83269..bf9a49e966489e0c5479274212b0ec0c56fcc064 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -39,13 +39,14 @@ force:
 
 # Rules for configuration files
 
-run/cf/%: custom/cf/% $(o)/config.mk $(s)/build/genconf
+run/cf/%: $(s)/cf/% $(o)/config.mk $(s)/build/genconf
        $(M)CF $<
        $(Q)$(s)/build/genconf $< $@ $(o)/config.mk
 
-run/cf/%: $(s)/cf/% $(o)/config.mk $(s)/build/genconf
+$(o)/%.cf: $(s)/%.cf $(o)/config.mk $(s)/build/genconf
        $(M)CF $<
        $(Q)$(s)/build/genconf $< $@ $(o)/config.mk
+       $(Q)cp $@ run/cf/$(basename $(@F))
 
 # Rules for libraries
 
@@ -185,7 +186,7 @@ $(DATAFILES): $(o)/%: $(s)/%
 # Default installation target
 
 default-install:
-       SH_EXTRA_RUNDIRS="$(sort $(EXTRA_RUNDIRS))" SH_INSTALL_RUNDIRS="$(sort $(INSTALL_RUNDIRS))" SH_CONFIGS="$(sort $(CONFIGS))" $(s)/build/installer $(INSTALL_DIR)
+       SH_EXTRA_RUNDIRS="$(sort $(EXTRA_RUNDIRS))" SH_INSTALL_RUNDIRS="$(sort $(INSTALL_RUNDIRS))" SH_CONFIGS="$(sort $(CONFIGS))" SH_AUTO_CONFIRM="$(CONFIRM)" $(s)/build/installer $(INSTALL_DIR)
 
 # Don't delete intermediate targets. There shouldn't be any, but due to bugs
 # in GNU Make rules with targets in not-yet-existing directories are ignored