ncurses (5.9-10) 04-fix-tabset-directory.diff

Summary

 misc/Makefile.in |    2 +-
 misc/gen_edit.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

    
download this patch

Patch contents

Description: Set tabset directory to /usr/share/tabset
 By default tun-tic.sh assumes the tabset directory is a sibling to
 the default terminfo directory, which is wrong the tabset files are
 installed into /usr/share/tabset, but the default terminfo directory
 should be /etc/terminfo rather than /usr/share/terminfo. This patch
 corrects that assumption.
Author: Sven Joachim <svenjoac@gmx.de>
Bug-Debian: http://bugs.debian.org/509919
Bug-Debian: http://bugs.debian.org/653435
Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653435#18
Last-Update: 2012-01-23

---
 misc/Makefile.in |    2 +-
 misc/gen_edit.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/misc/gen_edit.sh
+++ b/misc/gen_edit.sh
@@ -37,12 +37,12 @@
 #	The leaf directory names (lib, tabset, terminfo)
 #
 
-: ${ticdir=@TERMINFO@}
+: ${datadir=@datadir@}
 : ${xterm_new=@WHICH_XTERM@}
 
 # If we're not installing into /usr/share/, we'll have to adjust the location
 # of the tabset files in terminfo.src (which are in a parallel directory).
-TABSET=`echo $ticdir | sed -e 's%/terminfo$%/tabset%'`
+TABSET=${datadir}/tabset
 if test "x$TABSET" != "x/usr/share/tabset" ; then
 cat <<EOF
 s%/usr/share/tabset%$TABSET%g
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -120,7 +120,7 @@ terminfo.tmp : run_tic.sed $(source)
 
 run_tic.sed :
 	WHICH_XTERM=@WHICH_XTERM@ \
-	ticdir=${ticdir} \
+	datadir=${datadir} \
 	$(SHELL) $(srcdir)/gen_edit.sh >$@
 
 $(DESTDIR)$(bindir) \