X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/205744722001c218dc233c23dbb0870a2520c7d4..9b66d8959ffe52b626335f06c30f6e1c8e57380d:/package/ncurses/Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 27bd18cd4..1576637c2 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -1,20 +1,21 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=5.6
-PKG_RELEASE:=1
+PKG_VERSION:=5.7
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
-PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
+PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,19 +44,22 @@ CONFIGURE_ARGS += \
 	--with-terminfo-dirs=/usr/share/terminfo \
 	--with-default-terminfo-dir=/usr/share/terminfo
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		BUILD_CC="$(HOSTCC)" \
-		HOSTCC="$(HOSTCC)" \
-		HOSTCCFLAGS="" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		libs install.libs install.data
+MAKE_FLAGS += \
+	BUILD_CC="$(HOSTCC)" \
+	HOSTCC="$(HOSTCC)" \
+	HOSTCCFLAGS="" \
+	libs 
+
+define Build/Install/Default
+	$(MAKE_VARS) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(MAKE_INSTALL_FLAGS) \
+		$(1) install.libs install.data;
 endef
 
 define Package/libncurses/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}*.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/share/terminfo
 	(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
 		for dir in ??; do \
@@ -63,7 +67,7 @@ define Package/libncurses/install
 			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 \
+	for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
 		$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
 		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
 			$(1)/usr/share/terminfo/$$$$file; \
@@ -71,19 +75,11 @@ define Package/libncurses/install
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libncurses))