From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 8 Aug 2014 16:14:06 +0000 (+0200)
Subject: TOOL_TIC: Set to "/usr/bin/tic", instead of "tic"
X-Git-Tag: v3.3.0~74
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=85140f57cd44e815b7ec8522645d4c3c416bebb2;p=minix.git

TOOL_TIC: Set to "/usr/bin/tic", instead of "tic"

There is a tic command which comes with a package. When this package is
installed, this prevent "make build" from completing, as the packaged
tic as incompatible arguments.

Change-Id: Ic75057013b92158d715c5533f01d79f65317a400
---

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 92e8cb0da..11dfef6d8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -652,7 +652,13 @@ TOOL_STAT=		stat
 TOOL_STRFILE=		strfile
 TOOL_SUNLABEL=		sunlabel
 TOOL_TBL=		tbl
+.if defined(__MINIX)
+# LSC: There is a tic packaged, which has a completly different set of
+#      options, so make sure to use the base system one, always.
+TOOL_TIC=		/usr/bin/tic
+.else
 TOOL_TIC=		tic
+.endif # defined(__MINIX)
 TOOL_TOPROTO=		toproto
 TOOL_UUDECODE=		uudecode
 TOOL_VGRIND=		vgrind -f