[vlc-commits] contrib: ncurses: explicitly set PKG_CONFIG_LIBDIR

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Fri Aug  8 13:35:01 2014 -0400| [09fc49ca352c1c2505625cd923d87a6e8b2ab11b] | committer: Jean-Baptiste Kempf

contrib: ncurses: explicitly set PKG_CONFIG_LIBDIR

ncurses' heavily-modified autoconfigury expects this to be present.

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 05ceb797c3802add411249d7f0f0f9bbbba257a0)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ncurses/rules.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak
index 882e726..92b3e77 100644
--- a/contrib/src/ncurses/rules.mak
+++ b/contrib/src/ncurses/rules.mak
@@ -21,8 +21,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses
 	$(MOVE)
 
 .ncurses: ncurses
-	cd $< && $(HOSTVARS) ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files
+	cd $< && mkdir -p "$(PREFIX)/lib/pkgconfig" && $(HOSTVARS) PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig" ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --with-pkg-config=yes --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"
+	cd $</misc && make pc-files && cp ncursesw.pc "$(PREFIX)/lib/pkgconfig"
 	touch $@