Add a list of files which determine the kernel version as

DISTRIBVERDEP in Makefile.distrib, and make both sysinst and
distribution notes use that information so that they rebuild
if the kernel version changes.

Distribution notes didn't have this before, sysinst had a private
(now outdated, since sys/sys/param.h now determines version) copy
of this.

distrib/common/Makefile.distrib

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.distrib,v 1.5 2003/07/10 10:34:04 lukem Exp $
+#	$NetBSD: Makefile.distrib,v 1.6 2004/02/02 18:43:39 he Exp $
 #
 # Makefile snippet to setup various make variables variables used in distrib/:
 #
@@ -6,6 +6,7 @@
 #	DISTRIBDIR	Top level of distrib
 #	DISTRIBREV	NetBSD version without dots, as in "15ZD"
 #	DISTRIBVER	NetBSD version with dots, as in "1.5ZD"
+#	DISTRIBVERDEP	Files to depend on for version/revision vars above
 #
 # Commands defined:
 #	MAKESUMS	runs sets/makesums with the appropriate environment
@@ -21,6 +22,8 @@ _MAKEFILE_DISTRIB_=1
 DISTRIBDIR=	${NETBSDSRCDIR}/distrib
 DISTRIBREV!=	${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -s
 DISTRIBVER!=	${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+DISTRIBVERDEP=	${NETBSDSRCDIR}/sys/sys/param.h \
+		${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
 MAKESUMS=	CKSUM=${TOOL_CKSUM:Q} ${HOST_SH} ${DISTRIBDIR}/sets/makesums
 RELEASE_INSTALL=${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE}

distrib/notes/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.34 2003/07/26 17:06:52 salo Exp $
+#	$NetBSD: Makefile.inc,v 1.35 2004/02/02 18:43:39 he Exp $
 #
 
 # Ross Harvey <ross@NetBSD.org>
@@ -49,19 +49,19 @@ TOC.more=	${TOCS:M*.more.*}
 .endif
 
 
-${TARG}.ps: ${SRCS} ${TOC.ps}
+${TARG}.ps: ${SRCS} ${TOC.ps} ${DISTRIBVERDEP}
 	${TOOL_GROFF} ${ARGS_PS}   -mdoc      ${MAIN} > $@
 
 ${TARG}.pdf: ${TARG}.ps
 	ps2pdf ${TARG}.ps $@
 
-${TARG}.txt: ${SRCS} ${TOC.txt}
+${TARG}.txt: ${SRCS} ${TOC.txt} ${DISTRIBVERDEP}
 	${TOOL_GROFF} ${ARGS_TXT}  -mdoc      ${MAIN} > $@
 
-${TARG}.html: ${SRCS} ${TOC.html}
+${TARG}.html: ${SRCS} ${TOC.html} ${DISTRIBVERDEP}
 	${TOOL_GROFF} ${ARGS_HTML} -mdoc2html ${MAIN} > $@
 
-${TARG}.more: ${SRCS} ${TOC.more}
+${TARG}.more: ${SRCS} ${TOC.more} ${DISTRIBVERDEP}
 	${TOOL_GROFF} ${ARGS_MORE} -mdoc      ${MAIN} > $@
 
 

distrib/utils/sysinst/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.32 2003/12/01 01:11:57 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.33 2004/02/02 18:43:39 he Exp $
 #
 # Makefile for sysinst
 
@@ -13,6 +13,7 @@ MENUS_MD?=	menus.md.${SYSINSTLANG}
 
 .include <bsd.sys.mk>		# for HOST_SH
 .include <bsd.own.mk>		# for mk.conf
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 _MKSHTARGET_CREATE?=	${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}
 
@@ -23,11 +24,8 @@ LDSTATIC?=	-static
 UNIF_AWK=	${.CURDIR}/../../unif.awk
 MSG_XLAT_SH=	${.CURDIR}/../../msg_xlat.sh
 
-VERDEP=		${NETBSDSRCDIR}/sys/conf/osrelease.sh
-VER!=		${HOST_SH} ${VERDEP}
-
 CPPFLAGS+=	-I. -I${.CURDIR}/../.. -I${.CURDIR} \
-		-DREL=\"${VER}\" -DMACH=\"${MACHINE}\"
+		-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\"
 
 .if defined(SMALLPROG_INET6)
 CPPFLAGS+=-DINET6
@@ -91,7 +89,7 @@ msg_defs.c: msg.def
 	@rm -f msg_defs.oh
 
 # Needed to get proper dependency checks on osrelease
-msgtouch: ${VERDEP}
+msgtouch: ${DISTRIBVERDEP}
 	touch ${.TARGET}
 
 msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch