From d8a9f2abfc2a9e8b38f67c6bee5f7d744dadda16 Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Sat, 19 Dec 2015 17:30:00 +0000
Subject: [PATCH] Fix tools build.

---
 usr.bin/sortinfo/Makefile   | 4 +++-
 usr.bin/sortinfo/sortinfo.c | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/usr.bin/sortinfo/Makefile b/usr.bin/sortinfo/Makefile
index 9fafabafda72..4ba919ef99e6 100644
--- a/usr.bin/sortinfo/Makefile
+++ b/usr.bin/sortinfo/Makefile
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2015/12/18 18:56:47 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2015/12/19 17:30:00 joerg Exp $
 
 WARNS=6
 PROG=sortinfo
 
+.ifndef HOSTPROG
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
+.endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/sortinfo/sortinfo.c b/usr.bin/sortinfo/sortinfo.c
index dba63312b573..672a1dfa1d89 100644
--- a/usr.bin/sortinfo/sortinfo.c
+++ b/usr.bin/sortinfo/sortinfo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sortinfo.c,v 1.1 2015/12/18 18:56:47 christos Exp $	*/
+/*	$NetBSD: sortinfo.c,v 1.2 2015/12/19 17:30:00 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -29,8 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sortinfo.c,v 1.1 2015/12/18 18:56:47 christos Exp $");
+__RCSID("$NetBSD: sortinfo.c,v 1.2 2015/12/19 17:30:00 joerg Exp $");
 
 /*
  * Sort a texinfo(1) directory file.