Module Name: src
Committed By: he
Date: Fri Apr 23 14:10:19 UTC 2010
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.6 -r1.7 src/distrib/sparc64/cdroms/installcd/Makefile
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.19 src/distrib/i386/cdroms/Makefile.cdrom:1.20
--- src/distrib/i386/cdroms/Makefile.cdrom:1.19 Thu Apr 22 11:58:59 2010
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Apr 23 14:10:19 2010
@@ -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
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.6 src/distrib/sparc64/cdroms/installcd/Makefile:1.7
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.6 Thu Apr 22 11:58:59 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Apr 23 14:10:19 2010
@@ -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
