[src/trunk]: src/distrib/sets Simplify rules so tarfiles always attempt to re...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90050a22c354
branches:  trunk
changeset: 556859:90050a22c354
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Dec 29 04:46:18 2003 +0000

description:
Simplify rules so tarfiles always attempt to rebuild (let maketars determine
whether or not to continue based on METALOG if it choses). Fixes bug where
tar files were rebuilding every other time

diffstat:

 distrib/sets/Makefile |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 041691a42200 -r 90050a22c354 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Mon Dec 29 04:39:29 2003 +0000
+++ b/distrib/sets/Makefile     Mon Dec 29 04:46:18 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2003/12/29 03:13:25 lukem Exp $
+#      $NetBSD: Makefile,v 1.39 2003/12/29 04:46:18 jmc Exp $
 
 # The `all' target must appear before bsd.own.mk is pulled in.
 all:
@@ -69,7 +69,7 @@
        ${SETSENV} ${HOST_SH} ${.CURDIR}/checkflist -x ${CHECKFLIST_FLAGS}
 
 .PRECIOUS: maketars
-maketars: check_DESTDIR check_RELEASEDIR .WAIT maketarsetup .WAIT ${MAKETARSETS:@.TARS.@${RELEASEDIR}/${MACHINE}/binary/sets/${.TARS.}.tgz@}
+maketars: check_DESTDIR check_RELEASEDIR .WAIT maketarsetup .WAIT ${MAKETARSETS:@.TARS.@do-${.TARS.}@}
        @true
 
 maketarsetup: .PHONY
@@ -78,12 +78,10 @@
 .endif
        mkdir -p ${RELEASEDIR}/${MACHINE}/binary/sets
        for i in BSDSUM CKSUM MD5 SYSVSUM; do \
-               rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; done
-       -[ "${MAKETARSETS}" ] && for i in ${MAKETARSETS}; do \
-               rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tgz; done
+               rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; done
        
 .for tar in ${MAKETARSETS}
-${RELEASEDIR}/${MACHINE}/binary/sets/${tar}.tgz:
+do-${tar}: .PHONY
        ${SETSENV} ${HOST_SH} ${.CURDIR}/maketars -d ${DESTDIR:S,^$,/,} \
            ${METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \
            -t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar}
@@ -102,7 +100,7 @@
                        ${RELEASEDIR}/${MACHINE}/binary/sets/$$i; done
 
 .for tar in ${MAKETARSETS}
-do-sum-${tar}: .PHONY ${RELEASEDIR}/${MACHINE}/binary/sets/${tar}.tgz
+do-sum-${tar}: .PHONY do-${tar}
        ${SETSENV} ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar}.tgz
        for i in BSDSUM CKSUM MD5 SYSVSUM; do \
                ${TOOL_CAT} ${RELEASEDIR}/${MACHINE}/binary/sets/$$i >> ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; \