ncurses 5.9 - patch 20110625

[ncurses.git] / misc / run_tic.in

diff --git a/misc/run_tic.in b/misc/run_tic.in
index 9cbb4eefa4e428757d78d59e398f2c9fcc6ae6ef..c34302af69ee25406b97012116969d0a8501ac70 100644 (file)
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: run_tic.in,v 1.29 2010/10/23 20:49:04 tom Exp $
+# $Id: run_tic.in,v 1.32 2011/02/23 23:30:15 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -66,16 +66,21 @@ then
        if test -f ../progs/tic$suffix
        then
                case "$PATH" in
-               @PATH_SEPARATOR@*)
-                       PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH
+               \@PATH_SEPARATOR@*)
+                       PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
                        ;;
                *)
-                       PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH
+                       PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
                        ;;
                esac
                export PATH
-               SHLIB="sh $srcdir/shlib"
-               TIC_PATH="$SHLIB tic"
+               if test @DFT_LWR_MODEL@ = shared
+               then
+                       SHLIB="sh $srcdir/shlib"
+                       TIC_PATH="$SHLIB tic"
+               else
+                       TIC_PATH="tic"
+               fi
        elif test "$TIC_PATH" = unknown
        then
                echo '? no tic program found'
@@ -105,6 +110,14 @@ umask 022
 # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
 TICDIR=`echo $TERMINFO | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
 
+# Parent directory may not exist, which would confuse the install for hashed
+# database.  Fix.
+PARENT=`echo "$TERMINFO" | sed -e 's%/[^/]*$%%'`
+if test -n "$PARENT"
+then
+       test -d $PARENT || mkdir -p $PARENT
+fi
+
 # Remove the old terminfo stuff; we don't care if it existed before, and it
 # would generate a lot of confusing error messages if we tried to overwrite it.
 # We explicitly remove its contents rather than the directory itself, in case