Module Name: src Committed By: gdt Date: Thu Jan 27 15:34:38 UTC 2011
Modified Files: src/distrib/i386/cdroms: Makefile.cdrom Log Message: 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.22 -r1.23 src/distrib/i386/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/i386/cdroms/Makefile.cdrom diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.22 src/distrib/i386/cdroms/Makefile.cdrom:1.23 --- src/distrib/i386/cdroms/Makefile.cdrom:1.22 Fri Jan 14 10:26:33 2011 +++ src/distrib/i386/cdroms/Makefile.cdrom Thu Jan 27 15:34:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.22 2011/01/14 10:26:33 tsutsui Exp $ +# $NetBSD: Makefile.cdrom,v 1.23 2011/01/27 15:34:38 gdt 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