From befa5650d3db4e4bf84258aea44b44a948180a1a Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Tue, 6 Jun 2000 09:22:00 +0000
Subject: [PATCH] Minor rearrangement.

---
 share/mk/bsd.doc.mk   |  4 ++--
 share/mk/bsd.files.mk |  4 ++--
 share/mk/bsd.inc.mk   |  4 ++--
 share/mk/bsd.kinc.mk  | 10 +++++-----
 share/mk/bsd.kmod.mk  |  6 +++---
 share/mk/bsd.lib.mk   | 21 +++++++++++----------
 share/mk/bsd.man.mk   | 14 +++++++-------
 share/mk/bsd.nls.mk   |  4 ++--
 share/mk/bsd.prog.mk  | 11 ++++++-----
 9 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 6a4b66ee37d0..b9124566b048 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.doc.mk,v 1.46 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.doc.mk,v 1.47 2000/06/06 09:22:00 mycroft Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93
 
 .if !target(__initialized__)
@@ -53,10 +53,10 @@ FILES?=${SRCS}
 ALLFILES=Makefile ${FILES} ${EXTRA}
 
 docinstall:: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
+.PRECIOUS: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
 .if !defined(UPDATE)
 .PHONY: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
 .endif
-.PRECIOUS: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
 
 .for F in ${ALLFILES}
 .if !defined(BUILD) && !make(all) && !make(${F})
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index a45ad3a3018a..461282c9e089 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.files.mk,v 1.11 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.files.mk,v 1.12 2000/06/06 09:22:01 mycroft Exp $
 
 # This file can be included multiple times.  It clears the definition of
 # FILES at the end so that this is possible.
@@ -13,10 +13,10 @@ FILESGRP?=${BINGRP}
 FILESMODE?=${NONBINMODE}
 
 filesinstall:: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}@}
+.PRECIOUS: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}@}
 .if !defined(UPDATE)
 .PHONY: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}@}
 .endif
-.PRECIOUS: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}@}
 
 .for F in ${FILES}
 .if !defined(BUILD) && !make(all) && !make(${F})
diff --git a/share/mk/bsd.inc.mk b/share/mk/bsd.inc.mk
index 56a8d5ec15f1..167d3fd7cf75 100644
--- a/share/mk/bsd.inc.mk
+++ b/share/mk/bsd.inc.mk
@@ -1,14 +1,14 @@
-#	$NetBSD: bsd.inc.mk,v 1.14 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.inc.mk,v 1.15 2000/06/06 09:22:01 mycroft Exp $
 
 .PHONY:		incinstall
 includes:	${INCS} incinstall
 
 .if defined(INCS)
 incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
+.PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif
-.PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 
 .for I in ${INCS}
 ${DESTDIR}${INCSDIR}/$I: $I
diff --git a/share/mk/bsd.kinc.mk b/share/mk/bsd.kinc.mk
index b8d396ffcef3..bae1d73e4ec2 100644
--- a/share/mk/bsd.kinc.mk
+++ b/share/mk/bsd.kinc.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kinc.mk,v 1.14 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.kinc.mk,v 1.15 2000/06/06 09:22:01 mycroft Exp $
 
 # System configuration variables:
 #
@@ -64,8 +64,10 @@ SYMLINKS+=	${KDIR} ${INCSDIR}
 
 # make sure the directory is OK, and install includes.
 
+incinstall:: ${DESTDIR}${INCSDIR}
 .PRECIOUS: ${DESTDIR}${INCSDIR}
 .PHONY: ${DESTDIR}${INCSDIR}
+
 ${DESTDIR}${INCSDIR}:
 	@if [ ! -d ${.TARGET} ] || [ -h ${.TARGET} ] ; then \
 		echo creating ${.TARGET}; \
@@ -74,14 +76,12 @@ ${DESTDIR}${INCSDIR}:
 		    ${.TARGET}; \
 	fi
 
-incinstall:: ${DESTDIR}${INCSDIR}
-
 .if defined(INCS)
 incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
+.PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif
-.PRECIOUS: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 
 .for I in ${INCS}
 ${DESTDIR}${INCSDIR}/$I: ${DESTDIR}${INCSDIR} $I 
@@ -96,10 +96,10 @@ ${DESTDIR}${INCSDIR}/$I: ${DESTDIR}${INCSDIR} $I
 
 .if defined(DEPINCS)
 incinstall:: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
+.PRECIOUS: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .if !defined(UPDATE)
 .PHONY: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif
-.PRECIOUS: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 
 .for I in ${DEPINCS}
 ${DESTDIR}${INCSDIR}/$I: ${DESTDIR}${INCSDIR} $I 
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index df34e9dafeef..d38f876ca57a 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmod.mk,v 1.36 2000/01/22 19:31:01 mycroft Exp $
+#	$NetBSD: bsd.kmod.mk,v 1.37 2000/06/06 09:22:01 mycroft Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -60,14 +60,14 @@ cleankmod:
 #
 .if !target(kmodinstall)
 kmodinstall:: ${DESTDIR}${KMODDIR}/${PROG}
+.PRECIOUS: ${DESTDIR}${KMODDIR}/${PROG}
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${KMODDIR}/${PROG}
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${KMODDIR}/${PROG}: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${KMODDIR}/${PROG}
 ${DESTDIR}${KMODDIR}/${PROG}: ${PROG}
 	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${KMODOWN} \
 	    -g ${KMODGRP} -m ${KMODMODE} ${.ALLSRC} ${.TARGET}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 82ed09c98b24..9902eb860127 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.167 2000/05/03 15:15:50 matt Exp $
+#	$NetBSD: bsd.lib.mk,v 1.168 2000/06/06 09:22:01 mycroft Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -342,36 +342,37 @@ libinstall::
 
 .if ${MKLINKLIB} != "no"
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 ${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall
 .endif
 
 .if ${MKPROFILE} != "no"
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall
 .endif
 
 .if ${MKPIC} != "no" && ${MKPICINSTALL} != "no"
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE
 .endif
@@ -386,14 +387,14 @@ ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}_pic.a __archiveinstall
 
 .if ${MKPIC} != "no" && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR})
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
 	    -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${.TARGET}
@@ -414,14 +415,14 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${S
 
 .if ${MKLINT} != "no" && ${MKLINKLIB} != "no"
 libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
+.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
 	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
 	    -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index f7fee25ef318..eb707c58e3b9 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.52 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.man.mk,v 1.53 2000/06/06 09:22:02 mycroft Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
 .if !target(__initialized__)
@@ -76,10 +76,10 @@ __installpage: .USE
 # Rules for cat'ed man page installation
 .if defined(CATPAGES) && !empty(CATPAGES) && ${MKCATPAGES} != "no"
 catpages:: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
-.   if !defined(UPDATE)
-.PHONY: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
-.   endif
 .PRECIOUS: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
+.if !defined(UPDATE)
+.PHONY: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
+.endif
 
 .   for P in ${CATPAGES}
 .	if !defined(BUILD) && !make(all) && !make(${P})
@@ -94,10 +94,10 @@ catpages::
 # Rules for source page installation
 .if defined(MANPAGES) && !empty(MANPAGES)
 manpages:: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
-.   if !defined(UPDATE)
-.PHONY: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
-.   endif
 .PRECIOUS: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
+.if !defined(UPDATE)
+.PHONY: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
+.endif
 
 .   for P in ${MANPAGES}
 ${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}: ${P} __installpage
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index a727e65f3077..eb2ce71d688a 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.nls.mk,v 1.22 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.nls.mk,v 1.23 2000/06/06 09:22:02 mycroft Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -42,10 +42,10 @@ cleannls:
 	rm -f ${NLSALL}
 
 nlsinstall:: ${NLSALL:@F@${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat@}
+.PRECIOUS: ${NLSALL:@F@${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat@}
 .if !defined(UPDATE)
 .PHONY: ${NLSALL:@F@${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat@}
 .endif
-.PRECIOUS: ${NLSALL:@F@${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat@}
 
 .for F in ${NLSALL}
 .if !defined(BUILD) && !make(all) && !make(${F})
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 2e560e48357f..df13357e9970 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.113 2000/06/06 05:40:47 mycroft Exp $
+#	$NetBSD: bsd.prog.mk,v 1.114 2000/06/06 09:22:02 mycroft Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -134,16 +134,17 @@ afterdepend: .depend
 .endif
 
 .if defined(PROG) && !target(proginstall)
-PROGNAME?= ${PROG}
+PROGNAME?=${PROG}
+
 proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif
+
 .if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
 	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
 	    -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
@@ -160,10 +161,10 @@ SCRIPTSGRP?=${BINGRP}
 SCRIPTSMODE?=${BINMODE}
 
 scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
+.PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .if !defined(UPDATE)
 .PHONY: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .endif
-.PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 
 .for S in ${SCRIPTS}
 .if !defined(BUILD) && !make(all) && !make(${S})