# HG changeset patch
# User Vladimir Marek <Vladimir.Marek@oracle.com>
# Date 1433229223 -7200
# Node ID e0e6d134840bfef5546a07934d6a7a0ad10daf66
# Parent  f77b7f85081b198a2c14de866691080a548d54bf
17849875 Compilation fails when user has TERMINFO environment variable set

diff -r f77b7f85081b -r e0e6d134840b components/ncurses/Makefile
--- a/components/ncurses/Makefile	Thu Sep 24 13:35:31 2015 -0700
+++ b/components/ncurses/Makefile	Tue Jun 02 09:13:43 2015 +0200
@@ -55,6 +55,7 @@
 CONFIGURE_OPTIONS +=	--enable-rpath
 CONFIGURE_OPTIONS +=	--enable-widec
 CONFIGURE_OPTIONS +=	--includedir=$(USRINCDIR)/ncurses
+CONFIGURE_OPTIONS +=	--with-default-terminfo-dir=$(GNUSHARE)/terminfo
 
 # Needed to pass -m32 or -m64 to the C/C++ compiler and linker.
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
@@ -66,7 +67,7 @@
 # copying the one shipped with Sun's curses fixes it:
 COMPONENT_POST_INSTALL_ACTION += \
 	$(CP) /usr/share/lib/terminfo/s/sun-color \
-	$(PROTO_DIR)$(GNULIB)/terminfo/s/
+	$(PROTO_DIR)$(GNUSHARE)/terminfo/s/
 
 # common targets
 build:          $(BUILD_32_and_64)