diff options
| author | thorpej <thorpej@NetBSD.org> | 1996-10-18 05:55:26 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1996-10-18 05:55:26 +0000 |
| commit | 150c33e60b6c0a63c93e86e4f4e6cdff35563e4f (patch) | |
| tree | c20b14080777c147304dccb47e6406cc44124fd7 | |
| parent | 7f9ea0f2edf68e515fb857dde3206f667e267f29 (diff) | |
Use ${INSTALL}.
60 files changed, 141 insertions, 136 deletions
diff --git a/share/man/Makefile b/share/man/Makefile index 7ba571d6437..000d5314ddd 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,12 +1,12 @@ # from: @(#)Makefile 5.9 (Berkeley) 7/1/91 -# $Id: Makefile,v 1.7 1995/11/25 21:26:28 perry Exp $ +# $Id: Makefile,v 1.8 1996/10/18 05:55:26 thorpej Exp $ SUBDIR= man1 man3 man4 man5 man7 man8 man9 afterinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 makewhatis.sed \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 makewhatis.sed \ ${DESTDIR}/usr/share/man/makewhatis.sed - install -c -o ${BINOWN} -g ${BINGRP} -m 444 man0/COPYRIGHT \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 man0/COPYRIGHT \ ${DESTDIR}/usr/share/man/COPYRIGHT makedb: diff --git a/share/me/Makefile b/share/me/Makefile index 70e4a0beb7b..a4101dc082a 100644 --- a/share/me/Makefile +++ b/share/me/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.11 (Berkeley) 7/1/90 -# $Id: Makefile,v 1.7 1995/04/20 02:04:51 mycroft Exp $ +# $Id: Makefile,v 1.8 1996/10/18 05:57:14 thorpej Exp $ MELIB= ${BINDIR}/me TMLIB= ${BINDIR}/tmac @@ -22,7 +22,7 @@ realinstall: chown ${BINOWN}.${BINGRP} ${DESTDIR}${TMLIB}/$$i; \ chmod 444 ${DESTDIR}${TMLIB}/$$i; \ done - cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 revisions \ - ${DESTDIR}${MELIB}/revisions + cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + revisions ${DESTDIR}${MELIB}/revisions .include <bsd.prog.mk> diff --git a/share/misc/Makefile b/share/misc/Makefile index 71fc4ba678f..db40b351a2a 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.13 (Berkeley) 5/7/91 -# $Id: Makefile,v 1.7 1994/03/26 03:24:50 cgd Exp $ +# $Id: Makefile,v 1.8 1996/10/18 05:58:17 thorpej Exp $ FILES= airport ascii birthtoken eqnchar getopt inter.phone man.template \ mdoc.template na.phone operator style zipcodes @@ -8,7 +8,7 @@ NOOBJ= noobj all clean cleandir depend lint tags: realinstall: - cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/misc .include <bsd.prog.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index 4ccfe382e02..cf45c9adf7d 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1996/08/23 06:14:36 mrg Exp $ +# $NetBSD: Makefile,v 1.14 1996/10/18 05:58:40 thorpej Exp $ # @(#)Makefile 5.3 (Berkeley) 6/22/90 FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.kmod.mk bsd.lib.mk bsd.man.mk \ @@ -7,7 +7,7 @@ FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.kmod.mk bsd.lib.mk bsd.man.mk \ NOOBJ= noobj install: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/mk .include <bsd.prog.mk> diff --git a/share/skel/Makefile b/share/skel/Makefile index 4c128a88aa1..59b5865fc7e 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.3 (Berkeley) 6/8/90 -# $Id: Makefile,v 1.6 1994/02/10 01:55:04 cgd Exp $ +# $Id: Makefile,v 1.7 1996/10/18 05:59:07 thorpej Exp $ FILES= dot.cshrc dot.login dot.mailrc dot.profile dot.rhosts NOOBJ= noobj @@ -7,7 +7,7 @@ NOOBJ= noobj all clean cleandir depend lint tags: realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/skel .include <bsd.prog.mk> diff --git a/share/tabset/Makefile b/share/tabset/Makefile index 71c195ab341..350842d93de 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.3 (Berkeley) 10/22/90 -# $Id: Makefile,v 1.6 1994/02/10 01:55:11 cgd Exp $ +# $Id: Makefile,v 1.7 1996/10/18 05:59:33 thorpej Exp $ FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ stdcrt tandem653 teleray vt100 wyse-adds xerox1720 xerox1730 \ @@ -9,7 +9,7 @@ NOOBJ= noobj all clean cleandir depend lint tags: realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/tabset .include <bsd.prog.mk> diff --git a/share/termcap/Makefile b/share/termcap/Makefile index b3658c8aed0..86a1328e8c9 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.14 (Berkeley) 9/15/92 -# $Id: Makefile,v 1.17 1995/07/03 23:31:17 jtc Exp $ +# $Id: Makefile,v 1.18 1996/10/18 06:00:06 thorpej Exp $ MAN= termcap.5 @@ -10,11 +10,11 @@ termcap.db: termcap.src cap_mkdb -f termcap ${.ALLSRC} realinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \ ${DESTDIR}${BINDIR}/misc/termcap.db - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \ ${DESTDIR}${BINDIR}/misc/termcap - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \ ${DESTDIR}${BINDIR}/misc/map3270 diff --git a/share/tmac/Makefile b/share/tmac/Makefile index 0bf8b90c90b..533193b7b4b 100644 --- a/share/tmac/Makefile +++ b/share/tmac/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.13 (Berkeley) 3/20/91 -# $NetBSD: Makefile,v 1.13 1996/10/15 20:04:22 perry Exp $ +# $NetBSD: Makefile,v 1.14 1996/10/18 06:00:31 thorpej Exp $ BINDIR= /usr/share FILES= tmac.andoc @@ -21,7 +21,7 @@ realinstall: chown ${BINOWN}:${BINGRP} ${DESTDIR}${BINDIR}/tmac/tmac.$$i; \ chmod 444 ${DESTDIR}${BINDIR}/tmac/tmac.$$i; \ done - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/tmac .include <bsd.prog.mk> diff --git a/sys/Makefile b/sys/Makefile index 32f0c886e5f..35ccadc844c 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1996/10/15 06:50:26 mrg Exp $ +# $NetBSD: Makefile,v 1.9 1996/10/18 06:01:04 thorpej Exp $ # The ``rm -rf''s used below are safe because rm doesn't follow symbolic # links. @@ -30,14 +30,14 @@ copies: @echo copies: ${LDIRS} @-for i in ${LDIRS}; do \ rm -rf ${DESTDIR}/usr/include/$$i; \ - install -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}/usr/include/$$i ; \ done pax -rw -pa -L \ `find ${LDIRS} -follow -type f -name '*.h' '!' -path \ 'netiso/xebec/*' -print` ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/include/machine - install -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}/usr/include/machine pax -rw -pa -s "|arch/${MACHINE}/include||" \ arch/${MACHINE}/include/*.h \ @@ -45,7 +45,7 @@ copies: rm -rf ${DESTDIR}/usr/include/${MACHINE_ARCH} if test ${MACHINE} != ${MACHINE_ARCH} -a \ -d arch/${MACHINE_ARCH}/include; then \ - install -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}/usr/include/${MACHINE_ARCH}; \ pax -rw -pa -s "|arch/${MACHINE_ARCH}/include||" \ arch/${MACHINE_ARCH}/include/*.h \ diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile index 938ba016499..0e8ce24f2d4 100644 --- a/sys/arch/alpha/stand/boot/Makefile +++ b/sys/arch/alpha/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1996/09/23 04:33:01 cgd Exp $ +# $NetBSD: Makefile,v 1.10 1996/10/18 06:01:41 thorpej Exp $ .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa @@ -38,7 +38,7 @@ ${BOOT_PROG}: ${BOOT_OBJS} ${HEADERSIZE_PROG} bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${BOOT_PROG}.hdr` skip=1 install: - install -c -o bin -g bin -m 444 ${BOOT_PROG} \ + ${INSTALL} -c -o bin -g bin -m 444 ${BOOT_PROG} \ ${DESTDIR}${BINDIR}/${BOOT_PROG} clean: _SUBDIRUSE diff --git a/sys/arch/alpha/stand/bootxx/Makefile b/sys/arch/alpha/stand/bootxx/Makefile index ca86a84f455..064fbe2ef6e 100644 --- a/sys/arch/alpha/stand/bootxx/Makefile +++ b/sys/arch/alpha/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1996/09/23 04:33:03 cgd Exp $ +# $NetBSD: Makefile,v 1.6 1996/10/18 06:02:02 thorpej Exp $ .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa @@ -28,7 +28,7 @@ ${BOOT_PROG}: ${BOOT_OBJS} ${HEADERSIZE_PROG} dd if=${BOOT_PROG}.nohdr of=${BOOT_PROG} bs=`expr 15 \* 512` conv=sync install: - install -c -o bin -g bin -m 444 ${BOOT_PROG} \ + ${INSTALL} -c -o bin -g bin -m 444 ${BOOT_PROG} \ ${DESTDIR}${BINDIR}/${BOOT_PROG} clean: _SUBDIRUSE diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile index b062b5356b9..a059ec54e98 100644 --- a/sys/arch/alpha/stand/netboot/Makefile +++ b/sys/arch/alpha/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/09/23 04:30:56 cgd Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:02:24 thorpej Exp $ .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa @@ -44,7 +44,7 @@ ${BOOT_PROG}: ${BOOT_OBJS} ${HEADERSIZE_PROG} bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${BOOT_PROG}.hdr` skip=1 install: - install -c -o bin -g bin -m 444 ${BOOT_PROG} \ + ${INSTALL} -c -o bin -g bin -m 444 ${BOOT_PROG} \ ${DESTDIR}${BINDIR}/${BOOT_PROG} clean: _SUBDIRUSE diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile index 01216d0293a..a316314edea 100644 --- a/sys/arch/hp300/stand/Makefile +++ b/sys/arch/hp300/stand/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 1996/10/07 04:45:41 thorpej Exp $ +# $NetBSD: Makefile,v 1.22 1996/10/18 06:03:25 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/10/93 @@ -97,10 +97,11 @@ clean:: rm -f libdrive.a mkboot installboot install: - install -d -m 755 -o ${BINOWN} -g ${BINGRP} ${DESTDIR}/usr/mdec/rbootd - install -c -o ${BINOWN} -g ${BINGRP} -m 555 installboot \ + ${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} \ + ${DESTDIR}/usr/mdec/rbootd + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 installboot \ ${DESTDIR}/usr/mdec - install -c -o ${BINOWN} -g ${BINGRP} -m 444 uboot.lif \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 uboot.lif \ ${DESTDIR}/usr/mdec rm -f ${DESTDIR}/usr/mdec/rdboot ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/rdboot @@ -116,7 +117,7 @@ install: ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/bootct rm -f ${DESTDIR}/usr/mdec/rbootd/SYS_UBOOT ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/rbootd/SYS_UBOOT - install -c -o ${BINOWN} -g ${BINGRP} -m 444 inst.lif \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 inst.lif \ ${DESTDIR}/usr/mdec rm -f ${DESTDIR}/usr/mdec/rbootd/SYS_INST ln ${DESTDIR}/usr/mdec/inst.lif ${DESTDIR}/usr/mdec/rbootd/SYS_INST diff --git a/sys/arch/i386/isa/pcvt/Util/Makefile.inc b/sys/arch/i386/isa/pcvt/Util/Makefile.inc index 70eb3a03513..97d611620c8 100644 --- a/sys/arch/i386/isa/pcvt/Util/Makefile.inc +++ b/sys/arch/i386/isa/pcvt/Util/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 1995/10/07 21:51:42 jtc Exp $ +# $NetBSD: Makefile.inc,v 1.4 1996/10/18 06:04:08 thorpej Exp $ ECHO ?= echo @@ -15,7 +15,7 @@ INCGRP = bin INCMODE = 444 ${INCDIR}/pcvt_ioctl.h: ${.CURDIR}/../../pcvt_ioctl.h - install ${COPY} -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \ + ${INSTALL} ${COPY} -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \ ${.CURDIR}/../../pcvt_ioctl.h ${INCDIR} .depend: ${INCDIR}/pcvt_ioctl.h diff --git a/sys/arch/i386/isa/pcvt/Util/fonts/Makefile b/sys/arch/i386/isa/pcvt/Util/fonts/Makefile index 88de1773adf..dca50cac5c8 100644 --- a/sys/arch/i386/isa/pcvt/Util/fonts/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/fonts/Makefile @@ -12,7 +12,7 @@ install: ${FONTS} @if [ ! -d ${DESTDIR}${FONTDIR} ]; then mkdir ${DESTDIR}${FONTDIR};fi @for i in ${FONTS}; do \ ${ECHO} "installing font $$i into ${DESTDIR}${FONTDIR}"; \ - install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ + ${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ $$i ${DESTDIR}${FONTDIR}; \ done diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile index 940b272bc06..895c29b217e 100644 --- a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile +++ b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile @@ -12,7 +12,7 @@ beforeinstall: @if [ ! -d ${DESTDIR}${LIBDIR} ]; then mkdir ${DESTDIR}${LIBDIR};fi @${ECHO} "Saving old keycap database" -mv -f ${DESTDIR}${CAPPATH} ${DESTDIR}${CAPPATH}.BAK - install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ + ${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH} diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile index 241844f45e4..204501f9775 100644 --- a/sys/arch/mvme68k/stand/bootsd/Makefile +++ b/sys/arch/mvme68k/stand/bootsd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.1 1996/05/17 20:04:46 chuck Exp $ +# $NetBSD: Makefile,v 1.2 1996/10/18 06:06:47 thorpej Exp $ RELOC=0x3F0000 @@ -30,6 +30,6 @@ bootsd: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG} ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBSA} ${LIBBUG} install: - install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} + ${INSTALL} -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} .include <bsd.prog.mk> diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile index debdb5d5d44..f80cdd12388 100644 --- a/sys/arch/mvme68k/stand/bootst/Makefile +++ b/sys/arch/mvme68k/stand/bootst/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.3 1996/05/28 15:22:41 chuck Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:07:11 thorpej Exp $ RELOC=0x3F0000 @@ -34,6 +34,6 @@ bootst stboot: bootst.bug ${WRTVID} ${WRTVID} bootst.bug install: - install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} + ${INSTALL} -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} .include <bsd.prog.mk> diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile index a8606465a93..325dc04e27a 100644 --- a/sys/arch/mvme68k/stand/bootxx/Makefile +++ b/sys/arch/mvme68k/stand/bootxx/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.1 1996/05/17 20:11:31 chuck Exp $ +# $NetBSD: Makefile,v 1.2 1996/10/18 06:07:40 thorpej Exp $ RELOC=0x3F0000 @@ -29,6 +29,6 @@ bootxx: ${OBJS} ${BUGCRT} ${LIBS} ${LD} -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@ install: - install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} + ${INSTALL} -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} .include <bsd.prog.mk> diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile index 5df6943e6c0..dde9bf461e1 100644 --- a/sys/arch/mvme68k/stand/netboot/Makefile +++ b/sys/arch/mvme68k/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/05/17 21:08:25 chuck Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:05:55 thorpej Exp $ RELOC=0x3F0000 @@ -28,7 +28,7 @@ netboot.bin: netboot dd ibs=32 skip=1 if=netboot of=$@ install: - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ netboot.bin ${DESTDIR}${MDEC_DIR}/netboot .include <bsd.prog.mk> diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile index 5d236c37640..a6d745634b5 100644 --- a/sys/arch/mvme68k/stand/sboot/Makefile +++ b/sys/arch/mvme68k/stand/sboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/09/07 19:23:03 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:06:23 thorpej Exp $ # # sboot would like a newer GNU ld because it can generate S-Records. @@ -26,6 +26,7 @@ srec: ${.CURDIR}/srec.c ${CC} ${CFLAGS} ${.CURDIR}/srec.c -o ${.TARGET} install: - install -c -m 444 -g bin -o bin sboot.srec ${DESTDIR}${MDEC_DIR}/sboot + ${INSTALL} -c -m 444 -g bin -o bin sboot.srec \ + ${DESTDIR}${MDEC_DIR}/sboot .include <bsd.prog.mk> diff --git a/sys/arch/pmax/stand/Makefile b/sys/arch/pmax/stand/Makefile index 19e6b1e8709..cc13b44058e 100644 --- a/sys/arch/pmax/stand/Makefile +++ b/sys/arch/pmax/stand/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1996/02/01 22:32:19 mycroft Exp $ +# $NetBSD: Makefile,v 1.8 1996/10/18 06:08:15 thorpej Exp $ # @(#)Makefile 8.3 (Berkeley) 2/16/94 DESTDIR= @@ -98,8 +98,8 @@ clean cleandir: install: ./mkboot boot rzboot bootrz - install -o ${BINOWN} -g ${BINGRP} -m 444 rzboot ${DESTDIR}/usr/mdec - install -o ${BINOWN} -g ${BINGRP} -m 444 bootrz ${DESTDIR}/usr/mdec + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 rzboot ${DESTDIR}/usr/mdec + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 bootrz ${DESTDIR}/usr/mdec depend: ${SRCS} mkdep ${INCPATH} ${DEFS} ${SRCS} diff --git a/sys/arch/pmax/stand/Makefile.booters b/sys/arch/pmax/stand/Makefile.booters index 9f834743854..7377bd86004 100644 --- a/sys/arch/pmax/stand/Makefile.booters +++ b/sys/arch/pmax/stand/Makefile.booters @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.booters,v 1.7 1996/02/01 22:32:19 mycroft Exp $ +# $NetBSD: Makefile.booters,v 1.8 1996/10/18 06:08:15 thorpej Exp $ # @(#)Makefile 8.3 (Berkeley) 2/16/94 DESTDIR= @@ -98,8 +98,8 @@ clean cleandir: install: ./mkboot boot rzboot bootrz - install -o ${BINOWN} -g ${BINGRP} -m 444 rzboot ${DESTDIR}/usr/mdec - install -o ${BINOWN} -g ${BINGRP} -m 444 bootrz ${DESTDIR}/usr/mdec + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 rzboot ${DESTDIR}/usr/mdec + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 bootrz ${DESTDIR}/usr/mdec depend: ${SRCS} mkdep ${INCPATH} ${DEFS} ${SRCS} diff --git a/sys/arch/sparc/stand/Makefile b/sys/arch/sparc/stand/Makefile index 866aea12571..c9dbd353bf5 100644 --- a/sys/arch/sparc/stand/Makefile +++ b/sys/arch/sparc/stand/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1996/10/05 23:46:43 mrg Exp $ +# $NetBSD: Makefile,v 1.12 1996/10/18 06:08:53 thorpej Exp $ SUBDIR= boot bootxx installboot @@ -30,7 +30,7 @@ cleandir: _SUBDIRUSE BINDIR=/usr/mdec afterinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/binstall.sh ${DESTDIR}${BINDIR}/binstall .include <bsd.subdir.mk> diff --git a/sys/arch/sun3/stand/bootxx/Makefile b/sys/arch/sun3/stand/bootxx/Makefile index c8e56066b72..e57fe26dd54 100644 --- a/sys/arch/sun3/stand/bootxx/Makefile +++ b/sys/arch/sun3/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1995/11/17 23:23:48 gwr Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:09:43 thorpej Exp $ SA_PROG= bootxx SRCS= bootxx.c conf.c @@ -7,7 +7,7 @@ all: ${SA_PROG} # Do not strip or remove a.out header for this one. install: ${SA_PROG} - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG} .include <bsd.prog.mk> diff --git a/sys/arch/vax/boot/Makefile b/sys/arch/vax/boot/Makefile index aadea38df2e..33594b42ce6 100644 --- a/sys/arch/vax/boot/Makefile +++ b/sys/arch/vax/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1996/08/02 11:21:41 ragge Exp $ +# $NetBSD: Makefile,v 1.11 1996/10/18 06:10:18 thorpej Exp $ # INCPATH=-I. -I../../.. -I../.. -I../../../lib/libsa @@ -102,8 +102,9 @@ bootxx.o: bootxx.c # install: boot xxboot - install -c -o ${BINOWN} -g ${BINGRP} -m 444 boot ${DESTDIR}/ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 xxboot ${DESTDIR}/usr/mdec + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 boot ${DESTDIR}/ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 xxboot \ + ${DESTDIR}/usr/mdec rm -f ${DESTDIR}/usr/mdec/raboot ln ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/usr/mdec/raboot rm -f ${DESTDIR}/usr/mdec/hpboot diff --git a/sys/arch/x68k/fdboot/Makefile b/sys/arch/x68k/fdboot/Makefile index c9861b8407d..3061e804d42 100644 --- a/sys/arch/x68k/fdboot/Makefile +++ b/sys/arch/x68k/fdboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/05/28 17:01:25 oki Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:10:58 thorpej Exp $ #G=-g #M=-m68020 -fall-bsr @@ -31,7 +31,7 @@ installboot: fdboot .endif install: fdboot - install -c -o bin -g bin -m 444 fdboot ${DESTDIR}/usr/mdec + ${INSTALL} -c -o bin -g bin -m 444 fdboot ${DESTDIR}/usr/mdec clean:: rm -f fdboot fdboot.o bootufs.o fdboot.x diff --git a/sys/arch/x68k/sdboot/Makefile b/sys/arch/x68k/sdboot/Makefile index 2d9035293b9..671230a4836 100644 --- a/sys/arch/x68k/sdboot/Makefile +++ b/sys/arch/x68k/sdboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1996/05/05 12:17:15 oki Exp $ +# $NetBSD: Makefile,v 1.2 1996/10/18 06:11:29 thorpej Exp $ #G=-g #M=-m68020 -fall-bsr @@ -31,7 +31,7 @@ installboot: sdboot .endif install: sdboot - install -c -o bin -g bin -m 444 sdboot ${DESTDIR}/usr/mdec + ${INSTALL} -c -o bin -g bin -m 444 sdboot ${DESTDIR}/usr/mdec clean:: rm -f sdboot sdboot.o bootufs.o sdboot.x diff --git a/usr.bin/bdes/Makefile b/usr.bin/bdes/Makefile index cd05942573d..c3da522d0da 100644 --- a/usr.bin/bdes/Makefile +++ b/usr.bin/bdes/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 1995/07/24 04:30:47 cgd Exp $ +# $NetBSD: Makefile,v 1.2 1996/10/18 06:12:01 thorpej Exp $ MAN= bdes.1 SCRIPT= bdes.sh realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/bdes .include <bsd.prog.mk> diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 19fea4d4e4a..a4690a4a337 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 1995/03/27 08:46:11 glass Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:12:29 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= calendar beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/calendars/calendar.* ${DESTDIR}/usr/share/calendar .include <bsd.prog.mk> diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile index 414af5e7e68..a813bbbb49f 100644 --- a/usr.bin/compress/Makefile +++ b/usr.bin/compress/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1995/03/26 09:44:29 glass Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:12:59 thorpej Exp $ # @(#)Makefile 8.2 (Berkeley) 4/17/94 PROG= compress @@ -8,7 +8,7 @@ MLINKS= compress.1 uncompress.1 #MLINKS+=compress.1 zcat.1 #afterinstall: -# install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +# ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ # ${.CURDIR}/zcat.sh ${DESTDIR}/usr/bin/zcat .include <bsd.prog.mk> diff --git a/usr.bin/elfstrip/Makefile b/usr.bin/elfstrip/Makefile index 260e4938681..1321caf703f 100644 --- a/usr.bin/elfstrip/Makefile +++ b/usr.bin/elfstrip/Makefile @@ -1,10 +1,10 @@ # from: @(#)Makefile 5.4 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.2 1996/09/29 22:23:03 jonathan Exp $ +# $Id: Makefile,v 1.3 1996/10/18 06:21:30 thorpej Exp $ PROG= elfstrip realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 600 ${PROG} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 ${PROG} \ ${DESTDIR}${BINDIR} ./${PROG} ${DESTDIR}${BINDIR}/${PROG} chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG} diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile index 78ff48569d4..da094250d67 100644 --- a/usr.bin/false/Makefile +++ b/usr.bin/false/Makefile @@ -1,10 +1,10 @@ # from: @(#)Makefile 5.3 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.6 1994/12/22 13:10:49 cgd Exp $ +# $Id: Makefile,v 1.7 1996/10/18 06:13:43 thorpej Exp $ MAN= false.1 beforeinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/false.sh ${DESTDIR}${BINDIR}/false .include <bsd.prog.mk> diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index edeab3e514b..5c5deddeeba 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 1996/10/05 20:20:24 christos Exp $ +# $Id: Makefile,v 1.8 1996/10/18 06:14:17 thorpej Exp $ MAGIC= /etc/magic MAGICOWN= bin @@ -22,7 +22,7 @@ magic: $(MAGFILES) cat $(MAGFILES) > $(.TARGET) afterinstall: - install ${COPY} -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \ + ${INSTALL} ${COPY} -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \ $(DESTDIR)$(MAGIC) .include <bsd.prog.mk> diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile index 3a2e9b3a517..da7fcfa8385 100644 --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1995/04/19 07:24:08 cgd Exp $ +# $NetBSD: Makefile,v 1.15 1996/10/18 06:14:49 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/29/93 PROG= gprof @@ -7,7 +7,7 @@ SRCS= gprof.c arcs.c dfn.c lookup.c ${MACHINE_ARCH}.c hertz.c \ CFLAGS+= -D${MACHINE_ARCH} beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/gprof.flat ${.CURDIR}/gprof.callg \ ${DESTDIR}/usr/share/misc diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile index 99e7cf6208a..704a352fc4c 100644 --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -1,13 +1,13 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id: Makefile,v 1.4 1994/12/22 12:29:56 cgd Exp $ +# $Id: Makefile,v 1.5 1996/10/18 06:15:20 thorpej Exp $ PROG= id MAN= id.1 groups.1 whoami.1 afterinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/groups.sh ${DESTDIR}/usr/bin/groups - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/whoami.sh ${DESTDIR}/usr/bin/whoami .include <bsd.prog.mk> diff --git a/usr.bin/less/less/Makefile b/usr.bin/less/less/Makefile index a14bbf5a2ca..9e6b394ce14 100644 --- a/usr.bin/less/less/Makefile +++ b/usr.bin/less/less/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.6 (Berkeley) 3/12/91 -# $Id: Makefile,v 1.1.1.1 1996/01/22 03:14:17 mrg Exp $ +# $Id: Makefile,v 1.2 1996/10/18 06:18:57 thorpej Exp $ .include "../../Makefile.inc" @@ -16,7 +16,7 @@ MLINKS= less.1 more.1 less.1 page.1 LINKS= ${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \ ${DESTDIR}/usr/share/misc .include <bsd.prog.mk> diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index b4db0d446d6..39286fbf8e2 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $Id: Makefile,v 1.12 1996/04/25 01:23:37 jtc Exp $ +# $Id: Makefile,v 1.13 1996/10/18 06:16:10 thorpej Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -41,7 +41,7 @@ scan.c: scan.l scan.o: parse.c includes: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/FlexLexer.h \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/FlexLexer.h \ ${DESTDIR}/usr/include/g++ .include <bsd.prog.mk> diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile index 5e19415489a..3e69061dcaf 100644 --- a/usr.bin/locate/locate/Makefile +++ b/usr.bin/locate/locate/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:44 jtc Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:16:41 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= locate beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/updatedb.csh ${DESTDIR}/usr/libexec/locate.updatedb .include "../../Makefile.inc" diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile index 388e749d159..dea47c16fff 100644 --- a/usr.bin/lorder/Makefile +++ b/usr.bin/lorder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1995/12/18 07:59:12 jonathan Exp $ +# $NetBSD: Makefile,v 1.10 1996/10/18 06:17:04 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 MAN= lorder.1 @@ -11,7 +11,7 @@ SCRIPT= lorder.sh .endif realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/lorder .include <bsd.prog.mk> diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile index e2f2b9aa188..57638f8a8fd 100644 --- a/usr.bin/mail/Makefile +++ b/usr.bin/mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1996/06/08 19:48:09 christos Exp $ +# $NetBSD: Makefile,v 1.9 1996/10/18 06:17:36 thorpej Exp $ # @(#)Makefile 8.2 (Berkeley) 1/25/94 PROG= mail @@ -11,9 +11,9 @@ LINKS= ${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx MLINKS= mail.1 Mail.1 mail.1 mailx.1 beforeinstall: - cd ${.CURDIR}/misc; install -c -o ${BINOWN} -g ${BINGRP} \ + cd ${.CURDIR}/misc; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \ -m 444 ${SFILES} ${DESTDIR}/usr/share/misc - cd ${.CURDIR}/misc; install -c -o root -g wheel \ + cd ${.CURDIR}/misc; ${INSTALL} -c -o root -g wheel \ -m 644 ${EFILES} ${DESTDIR}/etc .if make(install) diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile index 51b35f6df2b..4fd370fec30 100644 --- a/usr.bin/mkdep/Makefile +++ b/usr.bin/mkdep/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:18:00 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 MAN= mkdep.1 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/mkdep.gcc.sh ${DESTDIR}/usr/bin/mkdep .include <bsd.prog.mk> diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile index 89ef7efee14..dfdaba06eaf 100644 --- a/usr.bin/pagesize/Makefile +++ b/usr.bin/pagesize/Makefile @@ -1,12 +1,12 @@ # @(#)Makefile 8.2 (Berkeley) 4/3/94 -# $NetBSD: Makefile,v 1.6 1995/09/05 01:11:10 cgd Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:18:22 thorpej Exp $ MAN= pagesize.1 SCRIPT= pagesize.sh realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/pagesize .include <bsd.prog.mk> diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile index 613ef7a9074..0894729d82f 100644 --- a/usr.bin/shar/Makefile +++ b/usr.bin/shar/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 1994/12/22 12:30:52 cgd Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:19:28 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 MAN= shar.1 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/shar.sh ${DESTDIR}/usr/bin/shar .include <bsd.prog.mk> diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile index c312b7aed3f..3150c0704d9 100644 --- a/usr.bin/skey/Makefile +++ b/usr.bin/skey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1996/09/19 19:44:32 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 1996/10/18 06:20:23 thorpej Exp $ PROG= skey CFLAGS+= -I${.CURDIR}/../../lib/libskey @@ -7,7 +7,9 @@ DPADD= ${LIBSKEY} LDADD= -lskey beforeinstall: - install -c -m 755 ${.CURDIR}/skeyaudit.sh ${DESTDIR}${BINDIR}/skeyaudit - install -c -m 755 ${.CURDIR}/skeyinfo.sh ${DESTDIR}${BINDIR}/skeyinfo + ${INSTALL} -c -m 755 ${.CURDIR}/skeyaudit.sh \ + ${DESTDIR}${BINDIR}/skeyaudit + ${INSTALL} -c -m 755 ${.CURDIR}/skeyinfo.sh \ + ${DESTDIR}${BINDIR}/skeyinfo .include <bsd.prog.mk> diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile index 22347b325c7..cde8e373c86 100644 --- a/usr.bin/strip/Makefile +++ b/usr.bin/strip/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.11 1996/10/08 22:00:18 christos Exp $ +# $NetBSD: Makefile,v 1.12 1996/10/18 06:20:54 thorpej Exp $ # @(#)Makefile 5.4 (Berkeley) 5/11/90 PROG= strip realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 600 strip \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 strip \ ${DESTDIR}${BINDIR} ./strip ${DESTDIR}${BINDIR}/strip chmod ${BINMODE} ${DESTDIR}${BINDIR}/strip diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index 3e679fff80d..793ba965232 100644 --- a/usr.bin/tput/Makefile +++ b/usr.bin/tput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1994/12/07 08:49:07 jtc Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:22:06 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= tput @@ -7,7 +7,7 @@ LDADD= -ltermcap MLINKS= tput.1 clear.1 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/clear.sh ${DESTDIR}/usr/bin/clear .include <bsd.prog.mk> diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile index 632a0ea2a43..a683171831a 100644 --- a/usr.bin/true/Makefile +++ b/usr.bin/true/Makefile @@ -1,10 +1,10 @@ # from: @(#)Makefile 5.3 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.6 1994/12/22 13:10:45 cgd Exp $ +# $Id: Makefile,v 1.7 1996/10/18 06:22:36 thorpej Exp $ MAN= true.1 beforeinstall: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/true.sh ${DESTDIR}${BINDIR}/true .include <bsd.prog.mk> diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index c1a9ce6b142..0f356ec2a4a 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 1996/04/06 06:00:58 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:23:04 thorpej Exp $ PROG= units beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/units.lib ${DESTDIR}/usr/share/misc .include <bsd.prog.mk> diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile index 8e41d6dcf10..2c31fb3d900 100644 --- a/usr.bin/vgrind/Makefile +++ b/usr.bin/vgrind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1994/12/23 21:11:56 pk Exp $ +# $NetBSD: Makefile,v 1.6 1996/10/18 06:23:43 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/9/93 PROG= vfontedpr @@ -13,13 +13,13 @@ vgrindefs.src.db: vgrindefs.src cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/vgrind.sh ${DESTDIR}/usr/bin/vgrind - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \ - ${DESTDIR}/usr/share/misc/vgrindefs - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/vgrindefs.src ${DESTDIR}/usr/share/misc/vgrindefs + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ vgrindefs.src.db ${DESTDIR}/usr/share/misc/vgrindefs.db - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \ ${DESTDIR}/usr/share/tmac .include <bsd.prog.mk> diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile index eb55d8fba9b..3dc148766ab 100644 --- a/usr.bin/vi/build/Makefile +++ b/usr.bin/vi/build/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1996/05/26 22:57:49 pk Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:24:12 thorpej Exp $ # # from: @(#)Makefile.in 8.56 (Berkeley) 5/18/96 @@ -35,4 +35,4 @@ MLINKS= vi.1 ex.1 vi.1 view.1 cat= dutch english german ru_SU.KOI8-R swedish datadir= ${DESTDIR}/usr/share afterinstall: - (cd ${.CURDIR}/../catalog && install -m $(NONBINMODE) -c $(cat) $(datadir)/vi/catalog ) + (cd ${.CURDIR}/../catalog && ${INSTALL} -m $(NONBINMODE) -c $(cat) $(datadir)/vi/catalog ) diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile index b949a914e58..3a7ba411515 100644 --- a/usr.bin/which/Makefile +++ b/usr.bin/which/Makefile @@ -1,10 +1,10 @@ # from: @(#)Makefile 5.5 (Berkeley) 7/1/90 -# $Id: Makefile,v 1.3 1994/12/22 12:31:36 cgd Exp $ +# $Id: Makefile,v 1.4 1996/10/18 06:24:43 thorpej Exp $ MAN= which.1 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/which.csh ${DESTDIR}${BINDIR}/which .include <bsd.prog.mk> diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index d4e38b10922..80aa751872c 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1994/12/22 12:31:39 cgd Exp $ +# $NetBSD: Makefile,v 1.8 1996/10/18 06:25:09 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= xinstall @@ -7,7 +7,7 @@ MAN= install.1 .PATH: ${.CURDIR}/../../bin/ls realinstall: - install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${PROG} ${DESTDIR}${BINDIR}/install .include <bsd.prog.mk> diff --git a/usr.bin/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile index 2e24c3102d4..3756dd73a30 100644 --- a/usr.bin/xlint/llib/Makefile +++ b/usr.bin/xlint/llib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:05 cgd Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:25:48 thorpej Exp $ LIBS= llib-lposix.ln llib-lstdc.ln all: ${LIBS} install: - install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ ${LIBS} ${DESTDIR}${LINTLIBDIR} clean cleanall: diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile index 41c833ca15d..bcefd1a4a63 100644 --- a/usr.bin/xlint/xlint/Makefile +++ b/usr.bin/xlint/xlint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $ +# $NetBSD: Makefile,v 1.3 1996/10/18 06:26:30 thorpej Exp $ .PATH: ${.CURDIR}/../lint1 @@ -9,7 +9,7 @@ MAN= lint.1 CFLAGS+=-I${.CURDIR}/../lint1 realinstall: - install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${PROG} ${DESTDIR}${BINDIR}/lint diff --git a/usr.sbin/named/ndc/Makefile b/usr.sbin/named/ndc/Makefile index 8aff887e4e7..5ae52d30f3b 100644 --- a/usr.sbin/named/ndc/Makefile +++ b/usr.sbin/named/ndc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1996/05/11 14:46:39 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:28:24 thorpej Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp .PATH: ${.CURDIR}/../man @@ -8,7 +8,7 @@ CLEANFILES+= ndc MAN= ndc.8 realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ndc ${DESTDIR}${BINDIR}/ndc ndc: ndc.sh Makefile ${.CURDIR}/../Makefile.inc diff --git a/usr.sbin/named/nslookup/Makefile b/usr.sbin/named/nslookup/Makefile index 74b34bb34a0..ee799b046c0 100644 --- a/usr.sbin/named/nslookup/Makefile +++ b/usr.sbin/named/nslookup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1996/02/02 15:29:56 mrg Exp $ +# $NetBSD: Makefile,v 1.2 1996/10/18 06:28:49 thorpej Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp .PATH: ${.CURDIR}/../nslookup \ @@ -13,7 +13,7 @@ CLEANFILES+= commands.c lex.yy.c lex.yy.o MAN= nslookup.8 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../nslookup/nslookup.help \ ${DESTDIR}/usr/share/misc/nslookup.help diff --git a/usr.sbin/named/reload/Makefile b/usr.sbin/named/reload/Makefile index 952c8e0633c..2ac39819672 100644 --- a/usr.sbin/named/reload/Makefile +++ b/usr.sbin/named/reload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1996/05/11 14:46:46 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:29:11 thorpej Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:46 vixie Exp .PATH: ${.CURDIR}/../man @@ -8,7 +8,7 @@ CLEANFILES+= named.reload MAN= named.reload.8 realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ named.reload ${DESTDIR}${BINDIR}/named.reload named.reload: named.reload.sh Makefile ${.CURDIR}/../Makefile.inc diff --git a/usr.sbin/named/restart/Makefile b/usr.sbin/named/restart/Makefile index f5adb8640be..6ba44d4b721 100644 --- a/usr.sbin/named/restart/Makefile +++ b/usr.sbin/named/restart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1996/05/11 14:46:49 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 1996/10/18 06:29:29 thorpej Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp .PATH: ${.CURDIR}/../man @@ -8,7 +8,7 @@ CLEANFILES+= named.restart MAN= named.restart.8 realinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ named.restart ${DESTDIR}${BINDIR}/named.restart named.restart: named.restart.sh Makefile ${.CURDIR}/../Makefile.inc diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile index 776968ebc34..32818f4aab8 100644 --- a/usr.sbin/sendmail/cf/cf/Makefile +++ b/usr.sbin/sendmail/cf/cf/Makefile @@ -34,7 +34,7 @@ clean cleandir: depend install: distribution: - install -c -o root -g wheel -m 444 netbsd-proto.cf \ + ${INSTALL} -c -o root -g wheel -m 444 netbsd-proto.cf \ ${DESTDIR}/etc/sendmail.cf # this is overkill, but.... |
