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

diff --git a/games/atc/Makefile b/games/atc/Makefile
index 8c67251..62147a1 100644 (file)
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:11 downsj Exp $
 #      $NetBSD: Makefile,v 1.9 1995/03/21 15:03:38 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -23,7 +24,7 @@ beforeinstall:
         else \
                 true ; \
         fi
-       (cd ${.CURDIR}/games; install -c -o ${BINOWN} -g ${BINGRP} -m 400 \
-           ${GAMES} ${DESTDIR}/usr/share/games/atc)
+       (cd ${.CURDIR}/games; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+           -m 400 ${GAMES} ${DESTDIR}/usr/share/games/atc)
 
 .include <bsd.prog.mk>

diff --git a/games/boggle/boggle/Makefile b/games/boggle/boggle/Makefile
index 56e8a06..c41641c 100644 (file)
--- a/games/boggle/boggle/Makefile
+++ b/games/boggle/boggle/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:12 downsj Exp $
 #      $NetBSD: Makefile,v 1.3 1995/03/21 12:14:28 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/11/93
 
@@ -9,8 +10,8 @@ HIDEGAME=hidegame
 MAN=   boggle.6
 
 beforeinstall:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/helpfile \
-           ${DESTDIR}/usr/share/games/boggle/helpfile
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+           ${.CURDIR}/helpfile ${DESTDIR}/usr/share/games/boggle/helpfile
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>

diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index c2fefd8..d67aed0 100644 (file)
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:13 downsj Exp $
 #      $NetBSD: Makefile,v 1.4 1995/03/21 15:08:18 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -8,7 +9,7 @@ LDADD=  -lm
 MLINKS=        caesar.6 rot13.6
 
 beforeinstall:
-       install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${.CURDIR}/rot13.sh ${DESTDIR}/usr/games/rot13
 
 .include <bsd.prog.mk>

diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 47f48a8..40ac1d1 100644 (file)
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:13 downsj Exp $
 #      $NetBSD: Makefile,v 1.5 1995/03/21 15:08:39 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -9,7 +10,7 @@ MAN=   cribbage.6
 HIDEGAME=hidegame
 
 beforeinstall: 
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/cribbage.n \
-           ${DESTDIR}/usr/share/games/cribbage.instr
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+           ${.CURDIR}/cribbage.n ${DESTDIR}/usr/share/games/cribbage.instr
 
 .include <bsd.prog.mk>

diff --git a/games/fish/Makefile b/games/fish/Makefile
index 61ab5d1..5691540 100644 (file)
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:14 downsj Exp $
 #      $NetBSD: Makefile,v 1.6 1995/03/23 08:28:14 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -6,7 +7,7 @@ MAN=    fish.6
 HIDEGAME=hidegame
 
 beforeinstall: 
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/fish.instr \
-           ${DESTDIR}/usr/share/games/fish.instr
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+           ${.CURDIR}/fish.instr ${DESTDIR}/usr/share/games/fish.instr
 
 .include <bsd.prog.mk>

diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index fa4c408..8297a0d 100644 (file)
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 1996/03/28 13:51:06 niklas Exp $
+#      $OpenBSD: Makefile,v 1.4 1996/12/08 15:36:15 downsj Exp $
 #      $NetBSD: Makefile,v 1.15 1996/02/29 00:21:16 jtc Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/19/94
 
@@ -26,9 +26,9 @@ STRFILE!=cd $(.CURDIR)/../strfile; \
 all: ${BLDS}
 
 install: ${SRCS} ${BLDS}
-       (cd ${.CURDIR} && install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+       (cd ${.CURDIR} && ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
            ${SRCS} ${DESTDIR}/usr/share/games/fortune)
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
            ${DESTDIR}/usr/share/games/fortune
 
 fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat:

diff --git a/games/hack/Makefile b/games/hack/Makefile
index eec49a2..f65bfd7 100644 (file)
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 1996/06/02 05:44:16 tholo Exp $
+#      $OpenBSD: Makefile,v 1.4 1996/12/08 15:36:16 downsj Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  hack
@@ -30,11 +30,11 @@ makedefs: makedefs.c
        ${HOSTCC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c ${LDADD}
 
 beforeinstall: 
-       install -c -o games -g games -m 600 /dev/null \
+       ${INSTALL} ${COPY} -o games -g games -m 600 /dev/null \
            ${DESTDIR}/var/games/hackdir/perm
-       install -c -o games -g games -m 600 /dev/null \
+       ${INSTALL} ${COPY} -o games -g games -m 600 /dev/null \
            ${DESTDIR}/var/games/hackdir/record
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
            ${.CURDIR}/hh ${.CURDIR}/data ${DESTDIR}/var/games/hackdir
        rm -f ${DESTDIR}/var/games/hackdir/bones*
 

diff --git a/games/larn/Makefile b/games/larn/Makefile
index 102edbd..073abac 100644 (file)
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:16 downsj Exp $
 #      $NetBSD: Makefile,v 1.8 1995/04/22 07:34:00 cgd Exp $
 #      @(#)Makefile    5.12 (Berkeley) 5/30/93
 
@@ -63,8 +64,8 @@ LDADD=        -ltermcap -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
-       (cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-           larnmaze larnopts larn.help \
+       (cd ${.CURDIR}/datfiles; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+           -m 444 larnmaze larnopts larn.help \
            ${DESTDIR}/usr/share/games/larn)
 
 .include <bsd.prog.mk>

diff --git a/games/monop/Makefile b/games/monop/Makefile
index 711fe88..4ac615e 100644 (file)
--- a/games/monop/Makefile
+++ b/games/monop/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 1996/03/09 01:33:29 niklas Exp $
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:17 downsj Exp $
 #      $NetBSD: Makefile,v 1.12 1995/03/23 08:34:32 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -20,7 +20,7 @@ initdeck: initdeck.c
        ${HOSTCC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/initdeck.c ${LDADD}
 
 beforeinstall:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 cards.pck \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 cards.pck \
            ${DESTDIR}/usr/share/games
 
 .include <bsd.prog.mk>

diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index e280e64..18a8784 100644 (file)
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -11,7 +11,7 @@ CATS= africa america areas arith asia babies bard chinese collectives \
 HIDEGAME=hidegame
 
 beforeinstall:
-       (cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-           ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
+       (cd ${.CURDIR}/datfiles; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+           -m 444 ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
 
 .include <bsd.prog.mk>

diff --git a/games/robots/Makefile b/games/robots/Makefile
index 0885bd6..a2bf82c 100644 (file)
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:19 downsj Exp $
 #      $NetBSD: Makefile,v 1.5 1995/04/22 10:08:46 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -11,7 +12,7 @@ LDADD=        -lcurses -ltermlib
 HIDEGAME=hidegame
 
 beforeinstall:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
            ${DESTDIR}/var/games/robots_roll
 
 .include <bsd.prog.mk>

diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 5e01994..eceab82 100644 (file)
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:19 downsj Exp $
 #      $NetBSD: Makefile,v 1.4 1995/04/22 07:53:41 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -5,7 +6,7 @@ NOOBJ=  noobj
 all wargames clean cleandir depend lint tags:
 
 install:
-       install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${.CURDIR}/wargames.sh ${DESTDIR}/usr/games/wargames
 
 .include <bsd.prog.mk>

diff --git a/games/wump/Makefile b/games/wump/Makefile
index 58c65e7..b9dde2d 100644 (file)
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -1,3 +1,4 @@
+#      $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:20 downsj Exp $
 #      $NetBSD: Makefile,v 1.4 1995/04/22 08:19:45 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
@@ -6,7 +7,7 @@ MAN=    wump.6
 HIDEGAME=hidegame
 
 beforeinstall:
-       install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/wump.info \
-           ${DESTDIR}/usr/share/games
+       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+           ${.CURDIR}/wump.info ${DESTDIR}/usr/share/games
 
 .include <bsd.prog.mk>