From: Peter Howkins <flibble@users.sf.net>
Date: Fri, 27 Jul 2012 13:39:08 +0000 (+0100)
Subject: Allow installing the terminfo file for dtterm to also work with path as
X-Git-Tag: 2.2.0a~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=be57b5323278fea28771801157cfcbf5d1fad810;p=oweals%2Fcde.git

Allow installing the terminfo file for dtterm to also work with path as
/usr/share/terminfo as well as /usr/share/lib/terminfo

This allows fully functioning dtterm on Ubuntu 12.04 on which the terminfo file
failed to install.
---

diff --git a/cde/admin/IntegTools/post_install/linux/configRun.src b/cde/admin/IntegTools/post_install/linux/configRun.src
index 3f36aa84..ba75bb33 100755
--- a/cde/admin/IntegTools/post_install/linux/configRun.src
+++ b/cde/admin/IntegTools/post_install/linux/configRun.src
@@ -157,7 +157,16 @@ doDttermTerminfo()
 	    chgrp bin /usr/share/lib/terminfo/d/dtterm
 	    chmod 644 /usr/share/lib/terminfo/d/dtterm
 	else
-	    echo "Unable to compile $DT_TOP/config/dtterm.ti"
+	    if [ -f /usr/share/terminfo/d/dtterm ]
+	    then
+		chown bin /usr/share/terminfo/d/dtterm
+		chgrp bin /usr/share/terminfo/d/dtterm
+		chmod 644 /usr/share/terminfo/d/dtterm
+	    fi
+	fi
+	if [ ! -f /usr/share/lib/terminfo/d/dtterm -a ! -f /usr/share/terminfo/d/dtterm ]
+	then
+	    echo "Unable to compile $DT_TOP/config/dtterm.ti"	    
 	fi
     else
 	echo "Unable to find $DT_TOP/config/dtterm.ti"