derive location of terminfo db from prefix

BerryFarm · Mar 6, 2016 · aadc2a6 · aadc2a6
1 parent 5fec711
commit aadc2a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -66,6 +66,9 @@ TI_LIBSO=libterminfo/libterminfo$(SO_SUFFIX)
 TI_OBJS=$(TI_SRCS:.c=.o)
 TI_LOBJS=$(TI_SRCS:.c=.lo)
 
+libterminfo/term.o: CPPFLAGS+=-DINSTALL_PREFIX=\"$(PREFIX)\"
+libterminfo/term.lo: CPPFLAGS+=-DINSTALL_PREFIX=\"$(PREFIX)\"
+
 CU_SRCS_=acs.c addbytes.c addch.c addchnstr.c addnstr.c attributes.c \
 	background.c bell.c border.c box.c chgat.c clear.c clearok.c \
 	clrtobot.c clrtoeol.c color.c copywin.c cr_put.c \

diff --git a/libterminfo/term.c b/libterminfo/term.c
@@ -45,7 +45,13 @@ __RCSID("$NetBSD: term.c,v 1.19 2015/11/26 01:03:22 christos Exp $");
 #include <term.h>
 #include <netbsd_sys/endian.h>
 
+#ifndef _PATH_TERMINFO
+#ifndef INSTALL_PREFIX
 #define _PATH_TERMINFO		"/usr/share/misc/terminfo"
+#else
+#define _PATH_TERMINFO INSTALL_PREFIX "/share/terminfo"
+#endif
+#endif
 
 static char database[PATH_MAX];
 static char pathbuf[PATH_MAX];