install -> ${INSTALL}, -c -> ${COPY}

diff --git a/share/mk/Makefile b/share/mk/Makefile
index 6fbe6a2..4c81443 100644 (file)
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 1996/06/03 22:59:15 niklas Exp $
+#      $OpenBSD: Makefile,v 1.6 1996/12/08 14:42:26 downsj Exp $
 #      $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $
 
 FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
@@ -7,7 +7,7 @@ FILES=  bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
 NOOBJ= noobj
 
 install:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
            ${DESTDIR}${BINDIR}/mk
 
 .include <bsd.prog.mk>

diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index eb210fc..c65c01b 100644 (file)
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.doc.mk,v 1.4 1996/07/27 10:05:51 deraadt Exp $
+#      $OpenBSD: bsd.doc.mk,v 1.5 1996/12/08 14:42:27 downsj Exp $
 #      $NetBSD: bsd.doc.mk,v 1.20 1994/07/26 19:42:37 mycroft Exp $
 #      @(#)bsd.doc.mk  8.1 (Berkeley) 8/14/93
 
@@ -43,7 +43,7 @@ clean cleandir:
 
 FILES?=        ${SRCS}
 install:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
            Makefile ${FILES} ${EXTRA} ${DESTDIR}${BINDIR}/${DIR}
 
 spell: ${SRCS}

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index ccce11a..d0ebb54 100644 (file)
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.lib.mk,v 1.9 1996/11/14 14:21:22 mickey Exp $
+#      $OpenBSD: bsd.lib.mk,v 1.10 1996/12/08 14:42:28 downsj Exp $
 #      $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
 #      @(#)bsd.lib.mk  5.26 (Berkeley) 5/2/91
 
@@ -180,7 +180,7 @@ beforeinstall:
 
 realinstall:
 #      ranlib lib${LIB}.a
-       install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \
+       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \
            ${DESTDIR}${LIBDIR}
 .if (${COPY} != "-p")
        ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
@@ -188,7 +188,7 @@ realinstall:
        chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .if !defined(NOPROFILE)
 #      ranlib lib${LIB}_p.a
-       install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
+       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
            lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 .if (${COPY} != "-p")
        ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
@@ -197,7 +197,7 @@ realinstall:
 .endif
 .if !defined(NOPIC) && (${MACHINE_ARCH} != "mips") 
 #      ranlib lib${LIB}_pic.a
-       install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
+       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
            lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
 .if (${COPY} != "-p")
        ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
@@ -205,11 +205,11 @@ realinstall:
        chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
 .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-       install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
 .endif
 .if !defined(NOLINT)
-       install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+       ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
 .endif
 .if defined(LINKS) && !empty(LINKS)

diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk
index e1e5e3b..a96af27 100644 (file)
--- a/share/mk/bsd.lkm.mk
+++ b/share/mk/bsd.lkm.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.lkm.mk,v 1.10 1996/11/14 14:21:22 mickey Exp $
+#      $OpenBSD: bsd.lkm.mk,v 1.11 1996/12/08 14:42:29 downsj Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -63,11 +63,11 @@ afterinstall:
 .if !target(realinstall)
 realinstall:
 .if defined(LKM)
-       install ${COPY} -o ${LKMOWN} -g ${LKMGRP} -m ${LKMMODE} \
+       ${INSTALL} ${COPY} -o ${LKMOWN} -g ${LKMGRP} -m ${LKMMODE} \
            ${COMBINED} ${DESTDIR}${LKMDIR}/${LKM}.o
 .if exists(${.CURDIR}/${POSTINSTALL})
-       install -c -o ${LKMOWN} -g ${LKMGRP} -m 555 ${.CURDIR}/${POSTINSTALL} \
-           ${DESTDIR}${LKMDIR}
+       ${INSTALL} ${COPY} -o ${LKMOWN} -g ${LKMGRP} -m 555 \
+           ${.CURDIR}/${POSTINSTALL} ${DESTDIR}${LKMDIR}
 .endif
 .endif
 .endif

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 826615b..583ea6b 100644 (file)
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.man.mk,v 1.13 1996/10/01 09:02:45 downsj Exp $
+#      $OpenBSD: bsd.man.mk,v 1.14 1996/12/08 14:42:30 downsj Exp $
 #      $NetBSD: bsd.man.mk,v 1.23 1996/02/10 07:49:33 jtc Exp $
 #      @(#)bsd.man.mk  5.2 (Berkeley) 5/11/90
 
@@ -30,7 +30,7 @@ TBL?=         tbl
 MANALL=        ${MAN:S/.1$/.cat1/g:S/.2$/.cat2/g:S/.3$/.cat3/g:S/.4$/.cat4/g:S/.5$/.cat5/g:S/.6$/.cat6/g:S/.7$/.cat7/g:S/.8$/.cat8/g:S/.9$/.cat9/g:S/.1tbl$/.cat1/g:S/.2tbl$/.cat2/g:S/.3tbl$/.cat3/g:S/.4tbl$/.cat4/g:S/.5tbl$/.cat5/g:S/.6tbl$/.cat6/g:S/.7tbl$/.cat7/g:S/.8tbl$/.cat8/g:S/.9tbl$/.cat9/g}
 .endif
 
-MINSTALL=      install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MINSTALL=      ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 .if defined(MANZ)
 # chown and chmod are done afterward automatically
 MCOMPRESS=     gzip -cf

diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index c0f1684..8c0c18d 100644 (file)
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.nls.mk,v 1.3 1996/03/05 11:12:50 mickey Exp $
+#      $OpenBSD: bsd.nls.mk,v 1.4 1996/12/08 14:42:31 downsj Exp $
 #      $NetBSD: bsd.nls.mk,v 1.2 1995/04/27 18:05:38 jtc Exp $
 
 .if !target(.MAIN)
@@ -32,8 +32,8 @@ nlsinstall:
        @for msg in ${NLSALL}; do \
                NLSLANG=`basename $$msg .cat`; \
                dir=${DESTDIR}${NLSDIR}/$${NLSLANG}; \
-               install -d $$dir; \
-               install ${COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
+               ${INSTALL} -d $$dir; \
+               ${INSTALL} ${COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
        done
 .endif
 

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index fe4ebed..e1b31f5 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.prog.mk,v 1.6 1996/11/14 14:41:39 mickey Exp $
+#      $OpenBSD: bsd.prog.mk,v 1.7 1996/12/08 14:42:32 downsj Exp $
 #      $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #      @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
 
@@ -107,7 +107,7 @@ afterinstall:
 .if !target(realinstall)
 realinstall:
 .if defined(PROG)
-       install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+       ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .if defined(HIDEGAME)