Fix installation of config files

Transition to etc/ broke some rules with hardcoded cf.

diff --git a/build/Makebottom b/build/Makebottom
index b164f2b7feffd8763028144b0580dbee72a5fabc..e252bbae743feed6a229e194b0f633f5f440d42b 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 $(s)/build/genconf
+run/$(CONFIG_DIR)/%: $(s)/cf/% $(o)/config.mk $(s)/build/genconf
        $(M)CF $<
        $(Q)$(s)/build/genconf $< $@ $(o)/config.mk
 

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 5690e9cd72d05094cab0b35a62ce7ec50ac26acc..8c5494b3c7f53c9e376eb48158b4354b3a063efb 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -26,7 +26,7 @@ CONFIGS+=$(FREE_CONFIGS)
 INSTALL_TARGETS+=install-configs
 install-configs:
        install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
-       install -m 644 $(addprefix run/cf/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+       install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.pc

diff --git a/images/Makefile b/images/Makefile
index 3badcd4225fe65543963b77dd24a300ed07b8b8b..e5793da9d6db3a80c9ddd2d5919f602d43c4ea51 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -90,6 +90,6 @@ install-libimages:
        install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
        install -m 644 run/lib/libimages.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
        install -m 644 run/lib/pkgconfig/libimages.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-       install -m 644 $(addprefix run/cf/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+       install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 .PHONY: install-libimages

diff --git a/ucw/Makefile b/ucw/Makefile
index 8ad225eb4511c2ab2a7ce958d91bdae52a6561a3..1fa3bfcfca8a9bbe53e5d52ed9564f392ceeb19e 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -156,6 +156,6 @@ install-libucw:
        install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
        install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 run/lib/libucw.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
-       install -m 644 run/cf/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
+       install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 .PHONY: install-libucw