Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch use ${INSTALL_FILE} as appropriate



details:   https://anonhg.NetBSD.org/src/rev/fa81e89875ca
branches:  trunk
changeset: 521948:fa81e89875ca
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Feb 09 09:35:59 2002 +0000

description:
use ${INSTALL_FILE} as appropriate

diffstat:

 sys/arch/arc/stand/mbr/Makefile           |   4 ++--
 sys/arch/hp300/stand/installboot/Makefile |   4 ++--
 sys/arch/hp300/stand/uboot/Makefile       |   6 +++---
 sys/arch/mvme68k/stand/bootst/Makefile    |  10 +++++-----
 sys/arch/mvme68k/stand/netboot/Makefile   |   7 +++----
 sys/arch/mvme68k/stand/sboot/Makefile     |   7 +++----
 sys/arch/sun3/stand/Makefile.inc          |   6 +++---
 sys/arch/sun3/stand/bootxx/Makefile       |   6 +++---
 sys/arch/sun68k/stand/Makefile.inc        |   6 +++---
 sys/arch/sun68k/stand/bootxx/Makefile     |   6 +++---
 sys/arch/vax/boot/boot/Makefile           |  14 +++++++-------
 11 files changed, 37 insertions(+), 39 deletions(-)

diffs (222 lines):

diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/arc/stand/mbr/Makefile
--- a/sys/arch/arc/stand/mbr/Makefile   Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/arc/stand/mbr/Makefile   Sat Feb 09 09:35:59 2002 +0000
@@ -12,8 +12,8 @@
        ${UUDECODE} ${.CURDIR}/msdos5mb.gz.uu
 
 realinstall:
-       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 mbr msdos5mb.gz \
-               ${DESTDIR}/usr/mdec
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
+               mbr msdos5mb.gz ${DESTDIR}/usr/mdec
 
 
 .include <bsd.prog.mk>
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/hp300/stand/installboot/Makefile
--- a/sys/arch/hp300/stand/installboot/Makefile Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/hp300/stand/installboot/Makefile Sat Feb 09 09:35:59 2002 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2001/12/12 01:49:43 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/02/09 09:36:00 lukem Exp $
 
 NOMAN= # defined
 
 beforeinstall:
-       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${INSTPRIV} \
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${.CURDIR}/installboot.sh ${DESTDIR}${BINDIR}/installboot
 
 .include <bsd.prog.mk>
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/hp300/stand/uboot/Makefile
--- a/sys/arch/hp300/stand/uboot/Makefile       Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/hp300/stand/uboot/Makefile       Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2001/12/14 07:36:32 gmcgarry Exp $
+#      $NetBSD: Makefile,v 1.7 2002/02/09 09:36:00 lukem Exp $
 
 PROGAOUT=      uboot
 PROGSOURCE=    uboot.c tgets.c
@@ -9,9 +9,9 @@
 .include "../Makefile.buildboot"
 
 install:
-       ${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
+       ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
            ${DESTDIR}${BINDIR}/rbootd
-       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${INSTPRIV} \
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
            uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
        rm -f ${DESTDIR}${BINDIR}/rdboot
        ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/mvme68k/stand/bootst/Makefile
--- a/sys/arch/mvme68k/stand/bootst/Makefile    Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/mvme68k/stand/bootst/Makefile    Sat Feb 09 09:35:59 2002 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/10/93
-#      $NetBSD: Makefile,v 1.13 2002/01/23 21:06:28 scw Exp $
+#      $NetBSD: Makefile,v 1.14 2002/02/09 09:36:00 lukem Exp $
 
 CLEANFILES+=stboot bootst bootst.bug
 
@@ -16,10 +16,10 @@
        @${WRTVID} bootst       # creates stboot
 
 proginstall::
-       ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
-          -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bootst ${DESTDIR}${MDEC_DIR}
-       ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
-          -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} stboot ${DESTDIR}${MDEC_DIR}
+       ${INSTALL_FILE} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+               bootst ${DESTDIR}${MDEC_DIR}
+       ${INSTALL_FILE} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+               stboot ${DESTDIR}${MDEC_DIR}
 
 .include "../Makefile.booters"
 
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/mvme68k/stand/netboot/Makefile
--- a/sys/arch/mvme68k/stand/netboot/Makefile   Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/mvme68k/stand/netboot/Makefile   Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2001/06/10 14:12:49 scw Exp $
+#      $NetBSD: Makefile,v 1.14 2002/02/09 09:36:00 lukem Exp $
 
 DEFS= -DSUN_BOOTPARAMS
 
@@ -17,8 +17,7 @@
 all realall: netboot.bin
 
 install: netboot.bin
-       ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
-          -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.OBJDIR}/netboot.bin \
-          ${DESTDIR}${MDEC_DIR}/netboot
+       ${INSTALL_FILE} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+               ${.OBJDIR}/netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
 
 .include <bsd.prog.mk>
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/mvme68k/stand/sboot/Makefile
--- a/sys/arch/mvme68k/stand/sboot/Makefile     Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/mvme68k/stand/sboot/Makefile     Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2000/12/18 21:27:01 scw Exp $
+#      $NetBSD: Makefile,v 1.12 2002/02/09 09:36:01 lukem Exp $
 
 #
 # sboot would like a newer GNU ld because it can generate S-Records.
@@ -33,8 +33,7 @@
 all realall:   sboot.srec
 
 install:       sboot.srec
-       ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
-          -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.OBJDIR}/sboot.srec \
-          ${DESTDIR}${MDEC_DIR}/sboot
+       ${INSTALL_FILE} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+               ${.OBJDIR}/sboot.srec ${DESTDIR}${MDEC_DIR}/sboot
 
 .include <bsd.prog.mk>
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/sun3/stand/Makefile.inc
--- a/sys/arch/sun3/stand/Makefile.inc  Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/sun3/stand/Makefile.inc  Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.19 2002/01/31 14:30:49 tsutsui Exp $
+#      $NetBSD: Makefile.inc,v 1.20 2002/02/09 09:36:01 lukem Exp $
 
 # Must have S=/usr/src/sys (or equivalent)
 # But note: this is w.r.t. a subdirectory
@@ -36,8 +36,8 @@
 .if !target(proginstall)
 realall: ${SA_PROG} ${SA_PROG}.bin
 proginstall: ${SA_PROG}.bin
-       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-         ${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
+       ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+               ${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
 .endif
 
 .endif # defined(SA_PROG)
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/sun3/stand/bootxx/Makefile
--- a/sys/arch/sun3/stand/bootxx/Makefile       Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/sun3/stand/bootxx/Makefile       Sat Feb 09 09:35:59 2002 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.10 2001/12/12 01:49:52 tv Exp $
+#      $NetBSD: Makefile,v 1.11 2002/02/09 09:36:02 lukem Exp $
 
 SA_PROG= bootxx
 SRCS=   bootxx.c conf.c
 
 # Do not strip or remove a.out header for this one.
 proginstall: ${SA_PROG}
-       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-       ${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
+       ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+               ${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
 
 PROG=  ${SA_PROG}
 NOMAN= # defined
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/sun68k/stand/Makefile.inc
--- a/sys/arch/sun68k/stand/Makefile.inc        Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/sun68k/stand/Makefile.inc        Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2001/06/14 12:57:12 fredette Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2002/02/09 09:36:02 lukem Exp $
 
 # Must have S=/usr/src/sys (or equivalent)
 # But note: this is w.r.t. a subdirectory
@@ -36,8 +36,8 @@
 .if !target(proginstall)
 realall: ${SA_PROG} ${SA_PROG}.bin
 proginstall: ${SA_PROG}.bin
-       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-         ${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
+       ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+               ${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
 .endif
 
 .endif # defined(SA_PROG)
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/sun68k/stand/bootxx/Makefile
--- a/sys/arch/sun68k/stand/bootxx/Makefile     Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/sun68k/stand/bootxx/Makefile     Sat Feb 09 09:35:59 2002 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.2 2001/12/12 01:50:01 tv Exp $
+#      $NetBSD: Makefile,v 1.3 2002/02/09 09:36:02 lukem Exp $
 
 SA_PROG= bootxx
 SRCS=   bootxx.c conf.c
 
 # Do not strip or remove a.out header for this one.
 proginstall: ${SA_PROG}
-       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-       ${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
+       ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+               ${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
 
 PROG=  ${SA_PROG}
 NOMAN= # defined
diff -r 85ddbef83bb7 -r fa81e89875ca sys/arch/vax/boot/boot/Makefile
--- a/sys/arch/vax/boot/boot/Makefile   Sat Feb 09 09:27:20 2002 +0000
+++ b/sys/arch/vax/boot/boot/Makefile   Sat Feb 09 09:35:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2001/12/23 02:21:35 matt Exp $
+#      $NetBSD: Makefile,v 1.23 2002/02/09 09:36:02 lukem Exp $
 
 S=     ${.CURDIR}/../../../..
 NOMAN= # defined
@@ -57,13 +57,13 @@
        ${SIZE} ${PROG}
 
 install:
-       ${INSTALL} ${COPY} -m 555 -o ${BINOWN} -g ${BINGRP} ${PROG} \
-           ${DESTDIR}${BINDIR}
-       ${INSTALL} ${COPY} -m 555 -o ${BINOWN} -g ${BINGRP} ${PROG} \
-           ${DESTDIR}${MDEC_DIR}
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
+               ${PROG} ${DESTDIR}${BINDIR}
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
+               ${PROG} ${DESTDIR}${MDEC_DIR}
 .if ${OBJECT_FMT} != "ELF"
-       ${INSTALL} ${COPY} -m 555 -o ${BINOWN} -g ${BINGRP} ${PROG}.mop \
-           ${DESTDIR}${MDEC_DIR}
+       ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
+               ${PROG}.mop ${DESTDIR}${MDEC_DIR}
 .endif
 
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index