From db6d12eeff7765aaf0ee26ab2cfae0ddd6f4c7fb Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Wed, 25 Jun 2008 16:04:28 +0200
Subject: [PATCH] Allow the name of the config file directory to be overridden.

---
 build/Makebottom | 8 ++++----
 build/Maketop    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/Makebottom b/build/Makebottom
index 19d1179d..0cea489e 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -7,7 +7,7 @@ runtree: run/.tree-stamp $(addsuffix /.dir-stamp,$(addprefix $(o)/,$(DIRS)))
 
 run/.tree-stamp: $(o)/config.mk
 	$(M)Creating runtree
-	$(Q)mkdir -p run $(addprefix run/, cf $(EXTRA_RUNDIRS) $(INSTALL_RUNDIRS))
+	$(Q)mkdir -p run $(addprefix run/, $(CONFIG_DIR) $(EXTRA_RUNDIRS) $(INSTALL_RUNDIRS))
 	$(Q)touch run/.tree-stamp
 
 # Miscellaneous targets
@@ -15,7 +15,7 @@ run/.tree-stamp: $(o)/config.mk
 programs: $(PROGS)
 datafiles: $(DATAFILES)
 tests: $(TESTS)
-configs: $(addprefix run/cf/,$(CONFIGS))
+configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
 
 tags:
 	etags `find . -name "*.[ch]"`
@@ -39,14 +39,14 @@ force:
 
 # Rules for configuration files
 
-run/cf/%: $(s)/cf/% $(o)/config.mk $(s)/build/genconf
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_DIR)/% $(o)/config.mk $(s)/build/genconf
 	$(M)CF $<
 	$(Q)$(s)/build/genconf $< $@ $(o)/config.mk
 
 $(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))
+	$(Q)cp $@ run/$(CONFIG_DIR)/$(basename $(@F))
 
 # Rules for libraries
 
diff --git a/build/Maketop b/build/Maketop
index 99f7f1dc..5981decf 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -1,5 +1,5 @@
 # Top part of Makefile for the UCW Libraries
-# (c) 1997--2007 Martin Mares <mj@ucw.cz>
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
 
 # Set to 1 if you want verbose output
 V=0
@@ -16,6 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
+CONFIG_DIR=cf
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
-- 
2.39.2