[vlc-commits] contrib: ncurses: configure doesn't understand --datarootdir

Rafaël Carré git at videolan.org
Fri Aug 15 21:06:38 CEST 2014


vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Aug  6 16:41:06 2014 +0200| [675da113afb699ba6d13d17ffd5ab2c91e0d031f] | committer: Jean-Baptiste Kempf

contrib: ncurses: configure doesn't understand --datarootdir

(cherry picked from commit 4568719e6018e9633d9cdb263bb67c03d18910e3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=675da113afb699ba6d13d17ffd5ab2c91e0d031f
---

 contrib/src/ncurses/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak
index aa60b91..882e726 100644
--- a/contrib/src/ncurses/rules.mak
+++ b/contrib/src/ncurses/rules.mak
@@ -21,7 +21,7 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses
 	$(MOVE)
 
 .ncurses: ncurses
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files
+	cd $< && $(HOSTVARS) ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files
 	cd $</ncurses && make -j1 && make install
 	cd $</include && make -j1 && make install
 	cd $</misc && make pc-files && mkdir -p "$(PREFIX)/lib/pkgconfig" && cp ncursesw.pc "$(PREFIX)/lib/pkgconfig"



More information about the vlc-commits mailing list