From be1d673d24eb7656c01123fc89be9c224eb25383 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 14 May 2002 07:49:12 +0000
Subject: [PATCH] Check that kldxref(8) exists before running it.

---
 UPDATING             | 5 +----
 sys/conf/kmod.mk     | 9 ++++-----
 sys/modules/Makefile | 5 ++++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/UPDATING b/UPDATING
index 241d0e44363b..8909183c42b0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -949,7 +949,7 @@ COMMON ITEMS:
 	make buildworld
 	make buildkernel KERNCONF=YOUR_KERNEL_HERE
 	cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2]
-	make installkernel KERNCONF=YOUR_KERNEL_HERE [6]
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	reboot in single user [3]
 	mergemaster -p		[5]
 	make installworld
@@ -1000,9 +1000,6 @@ COMMON ITEMS:
 	install) after the buildworld before this step if you last updated
 	from current before 20020224 or from -stable before 20020408.
 
-	[6] You may get a warning from kldxref.  Ignore it.  It doesn't
-	matter.
-
 FORMAT:
 
 This file contains a list, in reverse chronological order, of major
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 7119824465a0..d73af895cc23 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -170,10 +170,6 @@ ${KMOD}.kld: ${OBJS}
 .endif
 .endif
 
-.if !exists(/usr/sbin/kldxref)
-NO_XREF=yes
-.endif
-
 _ILINKS=@ machine
 
 all: objwarn ${PROG}
@@ -260,7 +256,10 @@ realinstall:
 	done; true
 .endif
 .if !defined(NO_XREF)
-	-kldxref ${DESTDIR}${KMODDIR}
+	@if type kldxref >/dev/null 2>&1; then \
+		${ECHO} kldxref ${DESTDIR}${KMODDIR}; \
+		kldxref ${DESTDIR}${KMODDIR}; \
+	fi
 .endif
 .endif
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 45f122558ac0..63784908b9c7 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -216,7 +216,10 @@ SUBDIR=${MODULES_OVERRIDE}
 .if !defined(NO_XREF)
 .MAKEFLAGS:=	${.MAKEFLAGS} -DNO_XREF
 afterinstall:
-	-kldxref ${DESTDIR}${KMODDIR}
+	@if type kldxref >/dev/null 2>&1; then \
+		${ECHO} kldxref ${DESTDIR}${KMODDIR}; \
+		kldxref ${DESTDIR}${KMODDIR}; \
+	fi
 .endif
 
 .include <bsd.subdir.mk>