X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=build%2FMakebottom;h=bf9a49e966489e0c5479274212b0ec0c56fcc064;hb=99dbc539d5ce9a0b119e7b59ed943c129f617ec0;hp=bf342b0cea618849897f0c1bc82a8e8cd829dad8;hpb=d60ede19ab84382101d313e3185b1a0ef6714088;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index bf342b0c..bf9a49e9 100644
--- 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
 
@@ -126,7 +127,7 @@ $(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
 
 $(o)/%.test: $(s)/%.t $(s)/build/tester
 	$(M)TEST $@
-	$(Q)$(s)/build/tester $< && touch $@
+	$(Q)$(s)/build/tester --rundir=run $(TESTERFLAGS) $< && touch $@
 
 # Rules for binaries
 
@@ -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