Module Name: src
Committed By: jym
Date: Sat Jan 29 01:54:33 UTC 2011
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.2 src/distrib/amd64/cdroms/Makefile.cdrom:1.3
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.2 Tue Jan 18 00:16:13 2011
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Jan 29 01:54:33 2011
@@ -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
