Revert "ncurses: package the tinfo library separately"
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 11 May 2016 10:49:21 +0000 (10:49 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 11 May 2016 10:49:21 +0000 (10:49 +0000)
This reverts commit r49361

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49372 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/libs/ncurses/Makefile

index 6a56fc5..94da02e 100644 (file)
@@ -61,7 +61,6 @@ CONFIGURE_ARGS += \
        --disable-home-terminfo \
        --with-normal \
        --with-shared \
        --disable-home-terminfo \
        --with-normal \
        --with-shared \
-       --with-termlib \
        --with-terminfo-dirs=/usr/share/terminfo \
        --with-default-terminfo-dir=/usr/share/terminfo \
        --enable-widec \
        --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
 
 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
                $(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,7 +124,7 @@ endef
 
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
 
 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
        $(INSTALL_DIR) $(2)/bin
                ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
        done
        $(INSTALL_DIR) $(2)/bin