Fix config directory names in build system

The destination directory does not have to have the same name as the
source one and the source one does not have to be 'cf' all the time (in
the libsonly package, it isn't).

diff --git a/build/Makebottom b/build/Makebottom
index 12b2d555e10b0597d248e4f487c0808801e8a7b2..1da4ae4e2aec6133eb33628d1165cf965c5e956f 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -42,7 +42,7 @@ force:
 
 # Rules for configuration files
 
-run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_SRC_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
        $(M)CF $<
        $(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
 

diff --git a/build/Maketop b/build/Maketop
index 743c7b9273d19fb0424163652c938f8576928b45..726806eb706f3805de42a13f56908ff1a06d4ae0 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -17,6 +17,7 @@ DIRS=
 PROGS=
 CONFIGS=
 CONFIG_DIR=etc
+CONFIG_SRC_DIR=cf
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 2264275ef0447a6e62bc67aa31e1400476112a2a..ffaa078d4d8efea53b77c05d9059e5e3cf9fe4db 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -15,6 +15,8 @@ BUILDSYS=$(s)/build
 # We will use the libucw build system
 include $(BUILDSYS)/Maketop
 
+CONFIG_SRC_DIR=etc
+
 # Install the build system
 include $(BUILDSYS)/Makefile