From: Martin Mares <mj@ucw.cz>
Date: Sun, 25 May 2008 17:39:47 +0000 (+0200)
Subject: Synchronized with current libucw.
X-Git-Tag: python-dummy-working~173
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=4e02effbbcaaa4c3082d23741e8b4c703b29985b;p=moe.git

Synchronized with current libucw.
---

diff --git a/TODO b/TODO
index a9eed88..8f207f6 100644
--- 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 90ff8c6..bf9a49e 100644
--- 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))