[src/trunk]: src/distrib/amd64/cdroms Mirror a change that was made on i386 b...

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

details:   https://anonhg.NetBSD.org/src/rev/6477ff157b7b
branches:  trunk
changeset: 761477:6477ff157b7b
user:      jym <jym%NetBSD.org@localhost>
date:      Sat Jan 29 01:54:33 2011 +0000

description:
Mirror a change that was made on i386 by gdt@.

XXX i386 and amd64 distrib have lots in common, maybe more files/logic
could/should be shared.

Message log reads:

Use ${INSTALL} ${COPY} instead of ${CP}.

This avoids a problem where files with mode 0400 (CVSREAD=t) are
copied to OBJDIR and then can't be re-copied on a subsequent build.
ok joerg@

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 620ad168d8f8 -r 6477ff157b7b distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Sat Jan 29 01:53:18 2011 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Sat Jan 29 01:54:33 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.2 2011/01/18 00:16:13 jym Exp $
+# $NetBSD: Makefile.cdrom,v 1.3 2011/01/29 01:54:33 jym Exp $
 
 .include <bsd.own.mk>
 
@@ -55,15 +55,15 @@
 
 image_md_pre:
        ${MKDIR} cdrom/libexec/dhcpcd-hooks
-       ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
-       ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+       ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
+       ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
        ${MKDIR} cdrom/etc
        ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
        ${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
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
        ${CHMOD} ugo+rx cdrom/sysinst
-       ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
        ${MKDIR} cdrom/var