17849875 Compilation fails when user has TERMINFO environment variable set
authorVladimir Marek <Vladimir.Marek@oracle.com>
Mon, 25 Nov 2013 12:18:53 +0100
changeset 1575 4e52e4728eda
parent 1574 d941894ffed8
child 1576 7d2b9559713b
17849875 Compilation fails when user has TERMINFO environment variable set
components/ncurses/Makefile
--- a/components/ncurses/Makefile	Mon Nov 25 23:00:24 2013 -0800
+++ b/components/ncurses/Makefile	Mon Nov 25 12:18:53 2013 +0100
@@ -53,6 +53,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)"
@@ -64,7 +65,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/
 
 ASLR_MODE = $(ASLR_ENABLE)