[vlc-devel] commit: ncurses contrib ( Rafaël Carré )

[git version control]

vlc | branch: 1.0-bugfix | Rafaël Carré <rafael.carre at gmail.com> | Wed Dec  2 01:55:22 2009 +0100| [222d55dbc1328a3a8a26063bdb38e8584b4e9b14] | committer: Rafaël Carré 

ncurses contrib

update to 5.7
only build & install library & headers
configure with --prefix=/usr so library (newterm() at least) will look
at installed terminfo database (ncurses interface wouldn't work on OSX)
(cherry picked from commit f5e4501049baf2c1b37e85386931117407dddab2)

Signed-off-by: Rafaël Carré <rafael.carre at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=222d55dbc1328a3a8a26063bdb38e8584b4e9b14
---

 extras/contrib/src/Makefile     |    3 ++-
 extras/contrib/src/packages.mak |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 30682b8..b2f63d1 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2406,7 +2406,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .ncurses: ncurses
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-debug --enable-widec --without-develop --without-shared && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=/usr --without-debug --enable-widec --without-develop --without-shared && make -C ncurses && make -C include && make -C ncurses DESTDIR=$(PREFIX) install && make -C include DESTDIR=$(PREFIX) install)
+	(cp -R $(PREFIX)/usr/* $(PREFIX) && rm -rf $(PREFIX)/usr)
 	touch $@
 
 CLEAN_FILE += .ncurses
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 78655ff..713f422 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -208,7 +208,7 @@ TAGLIB_VERSION=1.5
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
 LUA_VERSION=5.1
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
-NCURSES_VERSION=5.6
+NCURSES_VERSION=5.7
 NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 ASA_URL=$(VIDEOLAN)/testing/contrib/asa.git.tar.gz
 PCRE_VERSION=7.6