summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-04-27 20:57:09 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-04-27 20:57:09 +0000
commit56a4230d7d90fb05982c3f285faf62ad514d429a (patch)
tree784f50865a80748c56258016bcdf69d47f3e35b1 /sbin
parent5c1f80fa38ed55e3ed266e7cfbf19ea756f32b8d (diff)
COPY -> INSTALL_COPY and STRIP -> INSTALL_STRIP
This fixes namespace problems where STRIP is sometimes used as the name of the strip(1) to use and other times used as the flag to send install(1) when stripping (or not). COPY doesn't have this problem (yet) but was poorly named.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fastboot/Makefile6
-rw-r--r--sbin/mount_portal/Makefile4
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/fastboot/Makefile b/sbin/fastboot/Makefile
index 22577514bd0..49a6d8d677d 100644
--- a/sbin/fastboot/Makefile
+++ b/sbin/fastboot/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 1996/12/08 14:37:22 downsj Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:21 millert Exp $
# $NetBSD: Makefile,v 1.7 1995/03/18 14:55:27 cgd Exp $
MAN= fastboot.8
MLINKS= fastboot.8 fasthalt.8
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/fastboot.sh ${DESTDIR}${BINDIR}/fastboot
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/fasthalt.sh ${DESTDIR}${BINDIR}/fasthalt
.include <bsd.prog.mk>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 1e77debe67a..a55a5febcd0 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/03/23 04:43:22 millert Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:22 millert Exp $
# $NetBSD: Makefile,v 1.10 1995/03/18 14:57:50 cgd Exp $
PROG= mount_portal
@@ -14,6 +14,6 @@ CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
afterinstall:
if [ ! -f ${DESTDIR}/etc/portal.conf ]; then \
- ${INSTALL} ${COPY} -o root -g wheel -m 644 \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 \
${.CURDIR}/portal.conf ${DESTDIR}/etc; \
fi