ncurses 5.7 - patch 20101002

[ncurses.git] / misc / run_tic.in

diff --git a/misc/run_tic.in b/misc/run_tic.in
index 2732403a393d4da7d54c5ceef0d1aa625782790c..192d8d02582f772ecb26df2d7c8782492f1d889c 100644 (file)
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,7 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: run_tic.in,v 1.23 2006/10/28 19:43:30 tom Exp $
+# $Id: run_tic.in,v 1.28 2010/08/08 00:53:45 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -28,7 +28,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
 # authorization.                                                             #
 ##############################################################################
 #

-# Author: Thomas E. Dickey 1996,2000
+# Author: Thomas E. Dickey 1996-on

 #
 # This script is used to install terminfo.src using tic.  We use a script
 # because the path checking is too awkward to do in a makefile.
 #
 # This script is used to install terminfo.src using tic.  We use a script
 # because the path checking is too awkward to do in a makefile.


@@ -52,8 +52,7 @@ echo '** Building terminfo database, please wait...'
 : ${ticdir=@TERMINFO@}
 : ${source=@TERMINFO_SRC@}
 : ${LN_S="@LN_S@"}
 : ${ticdir=@TERMINFO@}
 : ${source=@TERMINFO_SRC@}
 : ${LN_S="@LN_S@"}

-: ${THAT_CC=cc}
-: ${THIS_CC=cc}
+: ${cross_compiling=no}

 : ${ext_funcs=@NCURSES_EXT_FUNCS@}
 
 test -z "${DESTDIR}" && DESTDIR=
 : ${ext_funcs=@NCURSES_EXT_FUNCS@}
 
 test -z "${DESTDIR}" && DESTDIR=


@@ -61,18 +60,31 @@ test -z "${DESTDIR}" && DESTDIR=
 # Allow tic to run either from the install-path, or from the build-directory.
 # Do not do this if we appear to be cross-compiling.  In that case, we rely
 # on the host's copy of tic to compile the terminfo database.
 # Allow tic to run either from the install-path, or from the build-directory.
 # Do not do this if we appear to be cross-compiling.  In that case, we rely
 # on the host's copy of tic to compile the terminfo database.

-if test "$THAT_CC" = "$THIS_CC" ; then
-case "$PATH" in
-:*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
-*) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
-esac
-export PATH
-SHLIB="sh $srcdir/shlib"
+if test "x$cross_compiling" = "xno"
+then
+       if test -f ../progs/tic$suffix
+       then
+               case "$PATH" in
+               @PATH_SEPARATOR@*)
+                       PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH
+                       ;;
+               *)
+                       PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH
+                       ;;
+               esac
+               export PATH
+               SHLIB="sh $srcdir/shlib"
+               TIC_PATH="$SHLIB tic"
+       elif test "$TIC_PATH" = unknown
+       then
+               echo '? no tic program found'
+               exit 1
+       fi

 else
 else

-# Cross-compiling, so don't set PATH or run shlib.
-SHLIB=
-# reset $suffix, since it applies to the target, not the build platform.
-suffix=
+       # Cross-compiling, so don't set PATH or run shlib.
+       SHLIB=
+       # reset $suffix, since it applies to the target, not the build platform.
+       suffix=

 fi
 
 
 fi
 
 


@@ -100,7 +112,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
 
 if test "$ext_funcs" = 1 ; then
 cat <<EOF
 
 if test "$ext_funcs" = 1 ; then
 cat <<EOF

-Running tic to install $TERMINFO ...
+Running $TIC_PATH to install $TERMINFO ...

 
        You may see messages regarding extended capabilities, e.g., AX.
        These are extended terminal capabilities which are compiled
 
        You may see messages regarding extended capabilities, e.g., AX.
        These are extended terminal capabilities which are compiled


@@ -110,7 +122,7 @@ Running tic to install $TERMINFO ...
        document, and install the terminfo without the -x option.
 
 EOF
        document, and install the terminfo without the -x option.
 
 EOF

-if ( $SHLIB tic$suffix -x -s -o $TERMINFO $source )
+if ( $TIC_PATH -x -s -o $TERMINFO $source )

 then
        echo '** built new '$TERMINFO
 else
 then
        echo '** built new '$TERMINFO
 else


@@ -119,7 +131,7 @@ else
 fi
 else
 cat <<EOF
 fi
 else
 cat <<EOF

-Running tic to install $TERMINFO ...
+Running $TIC_PATH to install $TERMINFO ...

 
        You may see messages regarding unknown capabilities, e.g., AX.
        These are extended terminal capabilities which may be compiled
 
        You may see messages regarding unknown capabilities, e.g., AX.
        These are extended terminal capabilities which may be compiled


@@ -129,7 +141,7 @@ Running tic to install $TERMINFO ...
        document, and install the terminfo without the -x option.
 
 EOF
        document, and install the terminfo without the -x option.
 
 EOF

-if ( $SHLIB tic$suffix -s -o $TERMINFO $source )
+if ( $TIC_PATH -s -o $TERMINFO $source )

 then
        echo '** built new '$TERMINFO
 else
 then
        echo '** built new '$TERMINFO
 else