Synchronized with current libucw.

diff --git a/TODO b/TODO
index a9eed88fe9fd4c135a1a65a1e7800a63c86eb573..8f207f6347408ebfc500e10f01f18285e3efd69b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 New directory layout
 ~~~~~~~~~~~~~~~~~~~~
 mop/ and public/ are broken
-sync with main libucw repo
 
 Evaluator
 ~~~~~~~~~

diff --git a/build/Makebottom b/build/Makebottom
index 90ff8c692218a7725b988ed6d58cf7cde662e2e8..bf9a49e966489e0c5479274212b0ec0c56fcc064 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -39,15 +39,11 @@ force:
 
 # Rules for configuration files
 
-run/cf/%: custom/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
        $(M)CF $<
        $(Q)$(s)/build/genconf $< $@ $(o)/config.mk
 
-$(o)/%.cf: $(s)/%.cf
+$(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))