From 4f62bb7d11b6aac955802649d582a489eee03671 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Tue, 16 Dec 2008 14:53:49 +0100 Subject: [PATCH] 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). --- build/Makebottom | 2 +- build/Maketop | 1 + free/libs/Makefile | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/Makebottom b/build/Makebottom index 12b2d555..1da4ae4e 100644 --- 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 743c7b92..726806eb 100644 --- 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 2264275e..ffaa078d 100644 --- 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 -- 2.39.2