X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Frun_tic.in;h=192d8d02582f772ecb26df2d7c8782492f1d889c;hp=fa20601e3b17829c9a2decc850695cd2ac3a20d0;hb=da518a7ad2d94c8e63186a49621e907967a31a37;hpb=bbb7fd37298f7d81386a4cf868417b9e084d7d90;ds=sidebyside

diff --git a/misc/run_tic.in b/misc/run_tic.in
index fa20601e..192d8d02 100644
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: run_tic.in,v 1.24 2009/08/15 17:19:36 tom Exp $
+# $Id: run_tic.in,v 1.28 2010/08/08 00:53:45 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2006,2009 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"), #
@@ -60,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.
-if test "x$cross_compiling" = "xno" ; 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"
+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
-# 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
 
 
@@ -99,7 +112,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
 
 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
@@ -109,7 +122,7 @@ Running tic to install $TERMINFO ...
 	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
@@ -118,7 +131,7 @@ else
 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
@@ -128,7 +141,7 @@ Running tic to install $TERMINFO ...
 	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