diff options
| -rw-r--r-- | package/ncurses/ncurses.mk | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index e180a95486..9805113802 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -36,6 +36,11 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) NCURSES_DEPENDENCIES += busybox endif +NCURSES_LIBS-y = libncurses +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += libmenu +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += libpanel +NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform + ifneq ($(BR2_ENABLE_DEBUG),y) NCURSES_CONF_OPT += --without-debug endif @@ -45,27 +50,13 @@ define NCURSES_BUILD_CMDS endef ifneq ($(BR2_PREFER_STATIC_LIB),y) - -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y) -define NCURSES_INSTALL_TARGET_PANEL - cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/ -endef -endif - -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM),y) -define NCURSES_INSTALL_TARGET_FORM - cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/ -endef -endif - -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_MENU),y) -define NCURSES_INSTALL_TARGET_MENU - cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/ +define NCURSES_INSTALL_TARGET_LIBS + for lib in $(NCURSES_LIBS-y); do \ + cp -dpf $(NCURSES_DIR)/lib/$${lib}.so* $(TARGET_DIR)/usr/lib/; \ + done endef endif -endif - ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) define NCURSES_INSTALL_TARGET_PROGS for x in $(NCURSES_PROGS); do \ @@ -78,10 +69,7 @@ endif define NCURSES_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib - $(if $(BR2_PREFER_STATIC_LIB),,cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/) - $(NCURSES_INSTALL_TARGET_PANEL) - $(NCURSES_INSTALL_TARGET_FORM) - $(NCURSES_INSTALL_TARGET_MENU) + $(NCURSES_INSTALL_TARGET_LIBS) $(NCURSES_INSTALL_TARGET_PROGS) ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo mkdir -p $(TARGET_DIR)/usr/share/terminfo/x |
