Fix firmwarehotplug stuff (#1103)

[openwrt/svn-archive/archive.git] / libs / ncurses / Makefile

diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile
index 75ca074b4fd8e0ce3221db91b2d59391276b0e83..2da60b969c7a71b50872245f984a7d0082e21755 100644 (file)
--- a/libs/ncurses/Makefile
+++ b/libs/ncurses/Makefile
@@ -37,6 +37,7 @@ define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+               CONFIG_SITE="" \
                ./configure \
                        --target=$(GNU_HOST_NAME) \
                        --host=$(GNU_HOST_NAME) \
@@ -80,7 +81,6 @@ define Build/Compile
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_linux_vers="2" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
@@ -116,6 +116,7 @@ define Build/Compile
                        --with-terminfo-dirs=/usr/share/terminfo \
                        --with-default-terminfo-dir=/usr/share/terminfo \
        );
+       rm -f $(PKG_BUILD_DIR)/lib/lib*
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                BUILD_CC="$(TARGET_CC)" \
@@ -126,11 +127,17 @@ define Build/Compile
 endef
 
 define Package/libncurses/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(1)/usr/lib/
-       install -d -m0755 $(1)/usr/share/terminfo
+       $(INSTALL_DIR) $(1)/usr/share/terminfo
+       (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
+               for dir in ??; do \
+                       [ -d "$$$$dir" ] || continue; \
+                       mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
+               done \
+       )
        for file in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
-               install -d -m0755 $(1)/usr/share/terminfo/`dirname $$$$file`; \
+               $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
                $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
                        $(1)/usr/share/terminfo/$$$$file; \
        done
@@ -144,9 +151,11 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(STAGING_DIR)/usr/lib/
 endef
 
 define Build/UninstallDev