[src/trunk]: src/distrib Um, as has been noted, INSTALL_FILE records what's i...

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

details:   https://anonhg.NetBSD.org/src/rev/615e17822948
branches:  trunk
changeset: 754193:615e17822948
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 23 14:10:19 2010 +0000

description:
Um, as has been noted, INSTALL_FILE records what's installed if it's
done unprived, and that doesn't go down well on a re-build.  So use
${INSTALL} ${COPY} instead to fix this problem.

diffstat:

 distrib/i386/cdroms/Makefile.cdrom        |   8 ++++----
 distrib/sparc64/cdroms/installcd/Makefile |  12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r 7c84513c4bdc -r 615e17822948 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Fri Apr 23 11:39:52 2010 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Fri Apr 23 14:10:19 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.19 2010/04/22 11:58:59 he Exp $
+# $NetBSD: Makefile.cdrom,v 1.20 2010/04/23 14:10:19 he Exp $
 
 .include <bsd.own.mk>
 
@@ -58,9 +58,9 @@
        ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
        ${MKDIR} cdrom/etc
        ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
-       ${INSTALL_FILE} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
-       ${INSTALL_FILE} ${.CURDIR}/../etc.rc cdrom/etc/rc
-       ${INSTALL_FILE} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
+       ${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
+       ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
+       ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
        ${CP} ${SYSINSTDIR}/sysinst cdrom
        ${CHMOD} ugo+rx cdrom/sysinst
diff -r 7c84513c4bdc -r 615e17822948 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Fri Apr 23 11:39:52 2010 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Fri Apr 23 14:10:19 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2010/04/22 11:58:59 he Exp $
+#      $NetBSD: Makefile,v 1.7 2010/04/23 14:10:19 he Exp $
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -60,13 +60,13 @@
        ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
        ${MKDIR} cdrom/etc
        ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
-       ${INSTALL_FILE} ${.CURDIR}/etc.ttys cdrom/etc/ttys
-       ${INSTALL_FILE} ${.CURDIR}/etc.rc cdrom/etc/rc
-       ${INSTALL_FILE} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
+       ${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
+       ${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
+       ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
-       ${INSTALL_FILE} -m 0555 ${SYSINSTDIR}/sysinst cdrom
+       ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
        for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
-               ${INSTALL_FILE} $$f cdrom; \
+               ${INSTALL} ${COPY} $$f cdrom; \
        done
        ${MKDIR} cdrom/var
        ${MKDIR} cdrom/kern