From eb21c5acccf973d2f5301fed736615701afd8f2d Mon Sep 17 00:00:00 2001 From: downsj Date: Sun, 8 Dec 1996 14:59:56 +0000 Subject: [PATCH] install -> ${INSTALL}, -c -> ${COPY} --- usr.sbin/adduser/Makefile | 4 ++-- usr.sbin/named/ndc/Makefile | 3 ++- usr.sbin/named/nslookup/Makefile | 3 ++- usr.sbin/named/reload/Makefile | 3 ++- usr.sbin/named/restart/Makefile | 3 ++- usr.sbin/sendmail/cf/cf/Makefile | 3 ++- usr.sbin/sendmail/src/Makefile | 10 +++++----- usr.sbin/ypserv/ypinit/Makefile | 8 ++++---- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile index 22f7b88d129..efe5286eb54 100644 --- a/usr.sbin/adduser/Makefile +++ b/usr.sbin/adduser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1996/12/08 13:57:06 downsj Exp $ +# $OpenBSD: Makefile,v 1.3 1996/12/08 14:59:56 downsj Exp $ # $From: Makefile,v 1.9 1996/11/17 03:51:26 wosch Exp $ SCRIPTS= adduser.perl rmuser.perl rmgroup.sh @@ -6,7 +6,7 @@ MAN= adduser.8 adduser_proc.8 rmuser.8 rmgroup.8 beforeinstall: .for script in ${SCRIPTS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R} .endfor diff --git a/usr.sbin/named/ndc/Makefile b/usr.sbin/named/ndc/Makefile index 0633b62889e..3e74b8b790b 100644 --- a/usr.sbin/named/ndc/Makefile +++ b/usr.sbin/named/ndc/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.5 1996/12/08 14:59:59 downsj Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:29:48 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp @@ -8,7 +9,7 @@ CLEANFILES+= ndc MAN= ndc.8 realinstall: ndc - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -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..2169d4a10f4 100644 --- a/usr.sbin/named/nslookup/Makefile +++ b/usr.sbin/named/nslookup/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.2 1996/12/08 15:00:00 downsj Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:29:56 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp @@ -13,7 +14,7 @@ CLEANFILES+= commands.c lex.yy.c lex.yy.o MAN= nslookup.8 beforeinstall: - install -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} ${COPY} -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 f3dc27095cd..9a589225198 100644 --- a/usr.sbin/named/reload/Makefile +++ b/usr.sbin/named/reload/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.5 1996/12/08 15:00:02 downsj Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:30:32 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:46 vixie Exp @@ -8,7 +9,7 @@ CLEANFILES+= named.reload MAN= named.reload.8 realinstall: named.reload - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -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 0aeedcf5a6c..d09d89295ef 100644 --- a/usr.sbin/named/restart/Makefile +++ b/usr.sbin/named/restart/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.5 1996/12/08 15:00:03 downsj Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:30:35 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp @@ -8,7 +9,7 @@ CLEANFILES+= named.restart MAN= named.restart.8 realinstall: named.restart - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -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 03cae566d3f..d6a7626bcd8 100644 --- a/usr.sbin/sendmail/cf/cf/Makefile +++ b/usr.sbin/sendmail/cf/cf/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.5 1996/12/08 15:00:04 downsj Exp $ # @(#)Makefile 8.17 (Berkeley) 9/12/95 # @@ -34,7 +35,7 @@ clean cleandir: depend install: distribution: - install -c -o root -g wheel -m 444 netbsd-proto.cf \ + ${INSTALL} ${COPY} -o root -g wheel -m 444 netbsd-proto.cf \ ${DESTDIR}/etc/sendmail.cf # this is overkill, but.... diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile index 1c434dc7556..11b697127e9 100644 --- a/usr.sbin/sendmail/src/Makefile +++ b/usr.sbin/sendmail/src/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1996/11/14 15:04:52 mickey Exp $ +# $OpenBSD: Makefile,v 1.9 1996/12/08 15:00:06 downsj Exp $ # # OpenBSD Makefile # @@ -38,11 +38,11 @@ BINGRP= kmem BINMODE=6555 beforeinstall: -# ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ +# ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ # ${DESTDIR}/etc/sendmail.fc - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/sendmail.st - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \ - ${DESTDIR}/usr/share/misc + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/sendmail.hf ${DESTDIR}/usr/share/misc .include diff --git a/usr.sbin/ypserv/ypinit/Makefile b/usr.sbin/ypserv/ypinit/Makefile index 8efaf862642..a3eb8071299 100644 --- a/usr.sbin/ypserv/ypinit/Makefile +++ b/usr.sbin/ypserv/ypinit/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.8 1996/05/30 09:53:15 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 1996/12/08 15:00:08 downsj Exp $ NOOBJ= noobj install: - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/ypinit.sh ${DESTDIR}/usr/sbin/ypinit - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/Makefile.yp ${DESTDIR}/var/yp/Makefile.yp - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/Makefile.main ${DESTDIR}/var/yp/Makefile.main .include -- 2.20.1