X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2FMakefile;h=e5793da9d6db3a80c9ddd2d5919f602d43c4ea51;hb=b56cd57bdce6b573ac0fc973ba4d16057c1e2ca5;hp=cc571e623705f722a725ad14c40722dc6413d24e;hpb=60845a95a7b99e52d5d8450fa8a9f1877eebd60c;p=libucw.git

diff --git a/images/Makefile b/images/Makefile
index cc571e62..e5793da9 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -83,19 +83,13 @@ $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
 $(o)/images/.include-stamp: IDST=images
 run/lib/pkgconfig/libimages.pc: $(o)/images/libimages.pc
 
-ifdef CONFIG_SHARED
-LIBIMAGES_NAME=libimages.so
-else
-LIBIMAGES_NAME=libimages.a
-endif
-
 INSTALL_TARGETS+=install-libimages
 install-libimages:
 	install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_BIN_DIR) $(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR) $(INSTALL_CONFIG_DIR))
 	install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
 	install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
-	install -m 644 run/lib/$(LIBIMAGES_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	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