Abuse .USE some more.

2000-06-06 09:53:29 +00:00 · 2000-06-06 09:53:29 +00:00 · b124cdf163
commit b124cdf163
parent befa5650d3
7 changed files with 73 additions and 42 deletions
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.doc.mk,v 1.47 2000/06/06 09:22:00 mycroft Exp $
+#	$NetBSD: bsd.doc.mk,v 1.48 2000/06/06 09:53:29 mycroft Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93

 .if !target(__initialized__)
@ -58,13 +58,15 @@ docinstall:: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
 .PHONY: ${ALLFILES:@F@${DESTDIR}${DOCDIR}/${DIR}/${F}@}
 .endif

+__docinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c -o ${DOCOWN} \
+	    -g ${DOCGRP} -m ${DOCMODE} ${.ALLSRC} ${.TARGET}
+
 .for F in ${ALLFILES}
 .if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${DOCDIR}/${DIR}/${F}: .MADE
 .endif
-${DESTDIR}${DOCDIR}/${DIR}/${F}: ${F}
-	${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c -o ${DOCOWN} \
-	    -g ${DOCGRP} -m ${DOCMODE} ${.ALLSRC} ${.TARGET}
+${DESTDIR}${DOCDIR}/${DIR}/${F}: ${F} __docinstall
 .endfor
 .endif

--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.files.mk,v 1.12 2000/06/06 09:22:01 mycroft Exp $
+#	$NetBSD: bsd.files.mk,v 1.13 2000/06/06 09:53:29 mycroft Exp $

 # This file can be included multiple times.  It clears the definition of
 # FILES at the end so that this is possible.
@ -18,14 +18,18 @@ filesinstall:: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${
 .PHONY: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}@}
 .endif

+__fileinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
+	    -o ${FILESOWN_${.ALLSRC}:U${FILESOWN}} \
+	    -g ${FILESGRP_${.ALLSRC}:U${FILESGRP}} \
+	    -m ${FILESMODE_${.ALLSRC}:U${FILESMODE}} \
+	    ${.ALLSRC} ${.TARGET}
+
 .for F in ${FILES}
 .if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}: .MADE
 .endif
-${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}: ${F}
-	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
-	    -o ${FILESOWN_${F}:U${FILESOWN}} -g ${FILESGRP_${F}:U${FILESGRP}} \
-	    -m ${FILESMODE_${F}:U${FILESMODE}} ${.ALLSRC} ${.TARGET}
+${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${F}:U${FILESNAME:U${F:T}}}: ${F} __fileinstall
 .endfor
 .endif

--- a/share/mk/bsd.inc.mk
+++ b/share/mk/bsd.inc.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.inc.mk,v 1.15 2000/06/06 09:22:01 mycroft Exp $
+#	$NetBSD: bsd.inc.mk,v 1.16 2000/06/06 09:53:29 mycroft Exp $

 .PHONY:		incinstall
 includes:	${INCS} incinstall
@ -10,14 +10,16 @@ incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif

-.for I in ${INCS}
-${DESTDIR}${INCSDIR}/$I: $I
+__incinstall: .USE
 	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
 	    (echo "${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c \
 		-o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} ${.ALLSRC} \
 		${.TARGET}" && \
 	     ${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c -o ${BINOWN} \
 		 -g ${BINGRP} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
+
+.for I in ${INCS}
+${DESTDIR}${INCSDIR}/$I: $I __incinstall
 .endfor
 .endif

--- a/share/mk/bsd.kinc.mk
+++ b/share/mk/bsd.kinc.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kinc.mk,v 1.15 2000/06/06 09:22:01 mycroft Exp $
+#	$NetBSD: bsd.kinc.mk,v 1.16 2000/06/06 09:53:30 mycroft Exp $

 # System configuration variables:
 #
@ -83,14 +83,16 @@ incinstall:: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PHONY: ${INCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif

-.for I in ${INCS}
-${DESTDIR}${INCSDIR}/$I: ${DESTDIR}${INCSDIR} $I 
-	@cmp -s ${.CURDIR}/$I ${.TARGET} > /dev/null 2>&1 || \
+__incinstall: .USE
+	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
 	    (echo "${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c \
-		-o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} ${.CURDIR}/$I \
+		-o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} ${.ALLSRC} \
 		${.TARGET}" && \
 	     ${INSTALL} ${RENAME} ${PRESERVE} ${INSTPRIV} -c -o ${BINOWN} \
-		-g ${BINGRP} -m ${NONBINMODE} ${.CURDIR}/$I ${.TARGET})
+		-g ${BINGRP} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
+
+.for I in ${INCS}
+${DESTDIR}${INCSDIR}/$I: $I __incinstall
 .endfor
 .endif

@ -101,13 +103,15 @@ incinstall:: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .PHONY: ${DEPINCS:@I@${DESTDIR}${INCSDIR}/$I@}
 .endif

-.for I in ${DEPINCS}
-${DESTDIR}${INCSDIR}/$I: ${DESTDIR}${INCSDIR} $I 
-	@cmp -s $I ${.TARGET} > /dev/null 2>&1 || \
+__depincinstall: .USE
+	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
 	    (echo "${INSTALL} ${RENAME} ${PRESERVE} -c -o ${BINOWN} \
-		-g ${BINGRP} -m ${NONBINMODE} $I ${.TARGET}" && \
+		-g ${BINGRP} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
 	     ${INSTALL} ${RENAME} ${PRESERVE} -c -o ${BINOWN} -g ${BINGRP} \
-		-m ${NONBINMODE} $I ${.TARGET})
+		-m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
+
+.for I in ${DEPINCS}
+${DESTDIR}${INCSDIR}/$I: $I __depincinstall
 .endfor
 .endif

--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmod.mk,v 1.37 2000/06/06 09:22:01 mycroft Exp $
+#	$NetBSD: bsd.kmod.mk,v 1.38 2000/06/06 09:53:30 mycroft Exp $

 .if !target(__initialized__)
 __initialized__:
@ -65,12 +65,14 @@ kmodinstall:: ${DESTDIR}${KMODDIR}/${PROG}
 .PHONY: ${DESTDIR}${KMODDIR}/${PROG}
 .endif

+__kmodinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${KMODOWN} \
+	    -g ${KMODGRP} -m ${KMODMODE} ${.ALLSRC} ${.TARGET}
+
 .if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${KMODDIR}/${PROG}: .MADE
 .endif
-${DESTDIR}${KMODDIR}/${PROG}: ${PROG}
-	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${KMODOWN} \
-	    -g ${KMODGRP} -m ${KMODMODE} ${.ALLSRC} ${.TARGET}
+${DESTDIR}${KMODDIR}/${PROG}: ${PROG} __kmodinstall
 .endif

 lint: ${LOBJS}
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.nls.mk,v 1.23 2000/06/06 09:22:02 mycroft Exp $
+#	$NetBSD: bsd.nls.mk,v 1.24 2000/06/06 09:53:30 mycroft Exp $

 .if !target(__initialized__)
 __initialized__:
@ -41,20 +41,33 @@ realall: ${NLSALL}
 cleannls:
 	rm -f ${NLSALL}

+nlsinstall:: ${DESTDIR}${NLSDIR}
+.PRECIOUS:: ${DESTDIR}${NLSDIR}
+.PHONY:: ${DESTDIR}${NLSDIR}
+
+${DESTDIR}${NLSDIR}:
+	@if [ ! -d ${.TARGET} ] || [ -h ${.TARGET} ] ; then \
+		echo creating ${.TARGET}; \
+		/bin/rm -rf ${.TARGET}; \
+		${INSTALL} ${INSTPRIV} -d -o ${NLSOWN} -g ${NLSGRP} -m 755 \
+		    ${.TARGET}; \
+	fi
+
 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

+__nlsinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${NLSOWN} \
+	    -g ${NLSGRP} -m ${NLSMODE} ${.ALLSRC} ${.TARGET}
+
 .for F in ${NLSALL}
 .if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat: .MADE
 .endif
-${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat: ${F}
-	${INSTALL} ${INSTPRIV} -d -o ${NLSOWN} -g ${NLSGRP} ${.TARGET:H}
-	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${NLSOWN} \
-	    -g ${NLSGRP} -m ${NLSMODE} ${.ALLSRC} ${.TARGET}
+${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat: ${F} __nlsinstall
 .endfor
 .else
 cleannls:
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.114 2000/06/06 09:22:02 mycroft Exp $
+#	$NetBSD: bsd.prog.mk,v 1.115 2000/06/06 09:53:30 mycroft Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94

 .if !target(__initialized__)
@ -142,12 +142,14 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
 .PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif

+__proginstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
+	    -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+
 .if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
-${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
-	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
-	    -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
 .endif

 .if !target(proginstall)
@ -166,16 +168,18 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRI
 .PHONY: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .endif

+__scriptinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
+	    -o ${SCRIPTSOWN_${.ALLSRC}:U${SCRIPTSOWN}} \
+	    -g ${SCRIPTSGRP_${.ALLSRC}:U${SCRIPTSGRP}} \
+	    -m ${SCRIPTSMODE_${.ALLSRC}:U${SCRIPTSMODE}} \
+	    ${.ALLSRC} ${.TARGET}
+
 .for S in ${SCRIPTS}
 .if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
 .endif
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S}
-	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
-	    -o ${SCRIPTSOWN_${S}:U${SCRIPTSOWN}} \
-	    -g ${SCRIPTSGRP_${S}:U${SCRIPTSGRP}} \
-	    -m ${SCRIPTSMODE_${S}:U${SCRIPTSMODE}} \
-	    ${.ALLSRC} ${.TARGET}
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall
 .endfor
 .endif