Module Name: src
Committed By: bouyer
Date: Tue Mar 20 09:17:43 UTC 2018
Modified Files:
src/share/mk [netbsd-8]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by martin in ticket #647):
share/mk/bsd.own.mk: revision 1.1051
Don't barf if the ctf tools are not installed.
[perhaps warn?]
To generate a diff of this commit:
cvs rdiff -u -r1.1009.2.3 -r1.1009.2.4 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.1009.2.3 src/share/mk/bsd.own.mk:1.1009.2.4
--- src/share/mk/bsd.own.mk:1.1009.2.3 Mon Nov 27 11:36:29 2017
+++ src/share/mk/bsd.own.mk Tue Mar 20 09:17:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1009.2.3 2017/11/27 11:36:29 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1009.2.4 2018/03/20 09:17:42 bouyer Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1554,7 +1554,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
