ncurses: change handling of PKG_CONFIG_LIBDIR

[openwrt/openwrt.git] / package / libs / ncurses / Makefile

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 25b3807b29bca617a86febec3bd044ccc0c9cd74..3d869ea18a84b93e744d80a92cb1bd443ff96839 100644 (file)
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -116,11 +116,19 @@ endef
 
 define Package/libncursesw/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/
+       for lib in ncurses panel menu form; do \
+               $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so* $(1)/usr/lib/; \
+               ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+       done
 endef
 
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
+       for lib in ncurses panel menu form; do \
+               ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+       done
+       ln -s . $(1)/usr/include/ncursesw
+       $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
        $(INSTALL_DIR) $(2)/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
        $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \