Merge pull request #100 from wigyori/master

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

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 6a56fc57e3dddf762e1d807debd2063473eeb3cc..d97d0b53cdb5e9d64b6980f2c133aa1473e5a93b 100644 (file)
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -61,7 +61,6 @@ CONFIGURE_ARGS += \
        --disable-home-terminfo \
        --with-normal \
        --with-shared \
-       --with-termlib \
        --with-terminfo-dirs=/usr/share/terminfo \
        --with-default-terminfo-dir=/usr/share/terminfo \
        --enable-widec \
@@ -117,7 +116,7 @@ endef
 
 define Package/libncursesw/install
        $(INSTALL_DIR) $(1)/usr/lib
-       for lib in ncurses panel menu form tinfo; do \
+       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
@@ -125,9 +124,10 @@ endef
 
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       for lib in ncurses panel menu form tinfo; do \
+       for lib in ncurses panel menu form; do \
                ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
        done
+       $(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' \