[mac80211] update compat-wireless to 2009-03-24

[openwrt.git] / package / ncurses / Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index a35bd80..27bd18c 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
 PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
 
 PKG_SOURCE_URL:=@GNU/ncurses
 PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
 

-PKG_BUILD_DEPENDS:=ncurses/host
-
-include $(INCLUDE_DIR)/host-build.mk

 include $(INCLUDE_DIR)/package.mk
 
 define Package/libncurses
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libncurses


@@ -28,14 +25,6 @@ define Package/libncurses
   URL:=http://www.gnu.org/software/ncurses/
 endef
 
   URL:=http://www.gnu.org/software/ncurses/
 endef
 

-define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) libs
-endef
-
-define Host/Install
-       $(MAKE) -C $(HOST_BUILD_DIR) install.progs
-endef
-

 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \


@@ -55,13 +44,9 @@ CONFIGURE_ARGS += \
        --with-default-terminfo-dir=/usr/share/terminfo
 
 define Build/Compile
        --with-default-terminfo-dir=/usr/share/terminfo
 
 define Build/Compile

-       cp \
-               $(HOST_BUILD_DIR)/ncurses/make_keys \
-               $(HOST_BUILD_DIR)/ncurses/make_hash \
-               $(PKG_BUILD_DIR)/ncurses/

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               BUILD_CC="$(TARGET_CC)" \
+               BUILD_CC="$(HOSTCC)" \

                HOSTCC="$(HOSTCC)" \
                HOSTCCFLAGS="" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                HOSTCC="$(HOSTCC)" \
                HOSTCCFLAGS="" \
                DESTDIR="$(PKG_INSTALL_DIR)" \


@@ -101,5 +86,4 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
 endef
 

-$(eval $(call HostBuild))

 $(eval $(call BuildPackage,libncurses))
 $(eval $(call BuildPackage,libncurses))