Module Name: src
Committed By: christos
Date: Thu Mar 15 13:44:45 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Don't barf if the ctf tools are not installed.
[perhaps warn?]
To generate a diff of this commit:
cvs rdiff -u -r1.1050 -r1.1051 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1050 src/share/mk/bsd.own.mk:1.1051
--- src/share/mk/bsd.own.mk:1.1050 Wed Mar 14 19:41:05 2018
+++ src/share/mk/bsd.own.mk Thu Mar 15 09:44:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1050 2018/03/14 23:41:05 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1051 2018/03/15 13:44:45 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1594,7 +1594,8 @@ TARGETS+= lintmanpages
TESTSBASE= /usr/tests${MLIBDIR:D/${MLIBDIR}}
# Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF) && \
+ (exists(${TOOL_CTFCONVERT}) || exists(/usr/bin/${TOOL_CTFCONVERT}))
CTFCONVERT= ${TOOL_CTFCONVERT}
CTFMERGE= ${TOOL_CTFMERGE}
.endif
