fix ncurses rebuild

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

diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile
index a06e29a05b47e2cb2bf89e58659015021cfaffd7..7c67e4f3dc563e6decb69538b151f71dd7573e84 100644 (file)
--- a/libs/ncurses/Makefile
+++ b/libs/ncurses/Makefile
@@ -36,7 +36,9 @@ endef
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
+       -$(MAKE) -C $(PKG_BUILD_DIR) distclean
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+               CONFIG_SITE="" \
                ./configure \
                        --target=$(GNU_HOST_NAME) \
                        --host=$(GNU_HOST_NAME) \
@@ -80,7 +82,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) \
@@ -127,9 +128,9 @@ 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; \
@@ -137,7 +138,7 @@ define Package/libncurses/install
                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