From: Michal Vaner Date: Thu, 6 Nov 2008 13:23:17 +0000 (+0100) Subject: Fix installation of config files X-Git-Tag: holmes-import~190^2 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=da5a491e58b64ed804043afae75a14e2768f99d8;p=libucw.git Fix installation of config files Transition to etc/ broke some rules with hardcoded cf. --- diff --git a/build/Makebottom b/build/Makebottom index b164f2b7..e252bbae 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 $(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 5690e9cd..8c5494b3 100644 --- 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 3badcd42..e5793da9 100644 --- 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 8ad225eb..1fa3bfcf 100644 --- 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