summaryrefslogtreecommitdiff
path: root/sys
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 /sys
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 'sys')
-rw-r--r--sys/arch/i386/boot.dos/Makefile4
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile4
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
-rw-r--r--sys/arch/i386/stand/mbr/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/netboot/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/sboot/Makefile6
-rw-r--r--sys/arch/mvme88k/stand/netboot/Makefile4
-rw-r--r--sys/arch/mvme88k/stand/openbsd/netboot/Makefile4
-rw-r--r--sys/arch/mvme88k/stand/openbsd/sboot/Makefile6
-rw-r--r--sys/arch/mvme88k/stand/sboot/Makefile6
-rw-r--r--sys/arch/powerpc/stand/boot.mac/Makefile4
-rw-r--r--sys/arch/powerpc/stand/boot/Makefile4
-rw-r--r--sys/arch/sparc/stand/boot/Makefile2
-rw-r--r--sys/arch/sparc/stand/bootxx/Makefile2
-rw-r--r--sys/arch/sun3/stand/Makefile.inc2
-rw-r--r--sys/arch/sun3/stand/bootxx/Makefile2
16 files changed, 31 insertions, 31 deletions
diff --git a/sys/arch/i386/boot.dos/Makefile b/sys/arch/i386/boot.dos/Makefile
index 2ccc2500b4f..6be426a0114 100644
--- a/sys/arch/i386/boot.dos/Makefile
+++ b/sys/arch/i386/boot.dos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/01/02 16:37:53 etheisen Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:26 millert Exp $
# $NetBSD: Makefile,v 1.18 1995/03/23 19:46:45 jtc Exp $
#
# Ported to boot 386BSD by Julian Elischer (julian@tfs.com)
@@ -27,7 +27,7 @@
PROG= boot.com
NOMAN= noman
-STRIP=
+INSTALL_STRIP=
S= ${.CURDIR}/../../..
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 5892f9824bf..31dc4d9f445 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/21 20:31:00 mickey Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:27 millert Exp $
PROG= biosboot
SRCS= biosboot.S
@@ -6,7 +6,7 @@ SRCS= biosboot.S
CPPFLAGS+=-DSTART=$(START) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL)
LD=ld
LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic
-STRIP=
+INSTALL_STRIP=
MAN= biosboot.8
all: machine-links
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index b46aaa47ff5..b6169356862 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/18 17:53:13 mickey Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:28 millert Exp $
PROG= boot
SRCS= srt0.S boot.c cmd.c conf.c
@@ -7,7 +7,7 @@ AFLAGS+=-Wa,-R
# AFLAGS+=-Wa,-a
LD=ld
LDFLAGS+=-nostdlib -Ttext $(START) -z -x -e start_boot -Bstatic
-STRIP=
+INSTALL_STRIP=
MAN= boot.8
SADIR=${.CURDIR}/..
diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile
index ae3e65fc3a3..0d06a0c70e8 100644
--- a/sys/arch/i386/stand/mbr/Makefile
+++ b/sys/arch/i386/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/04/21 20:31:00 mickey Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:29 millert Exp $
#
PROG= mbr
@@ -7,7 +7,7 @@ AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
LD=ld
LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic
MAN+= mbr.8
-STRIP=
+INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index 8c6a70b860e..dcde93b7057 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/04/22 16:13:43 gvf Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:30 millert Exp $
RELOC=0x3F0000
SIZE?= size
@@ -32,7 +32,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${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 48bf0b26df7..19b444f8352 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/22 16:13:44 gvf Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:30 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -35,9 +35,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 2036c5d5c11..9d9d9cfc850 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:30:39 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:32 millert Exp $
RELOC=0x3F0000
@@ -25,7 +25,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/openbsd/netboot/Makefile b/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
index 97900f2351c..dd675f294da 100644
--- a/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:31:08 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:33 millert Exp $
RELOC=0x3F0000
@@ -25,7 +25,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/openbsd/sboot/Makefile b/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
index 95b897d90c2..076deb2e306 100644
--- a/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:31:10 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:34 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -31,9 +31,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index b1bb7bfe205..076deb2e306 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:30:41 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:34 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -31,9 +31,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/powerpc/stand/boot.mac/Makefile b/sys/arch/powerpc/stand/boot.mac/Makefile
index d49130243a6..2ad27f5be94 100644
--- a/sys/arch/powerpc/stand/boot.mac/Makefile
+++ b/sys/arch/powerpc/stand/boot.mac/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1997/04/01 21:01:48 rahnds Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:56:35 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
R= ..
@@ -11,7 +11,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
CFLAGS+= -DEXEC_ELF
NOMAN=
-STRIP=
+INSTALL_STRIP=
MAKEELF= makeelf
BINDIR= /usr/mdec
OBJCOPY?= objcopy
diff --git a/sys/arch/powerpc/stand/boot/Makefile b/sys/arch/powerpc/stand/boot/Makefile
index 0200cdfd3a6..e8eb2c59ca6 100644
--- a/sys/arch/powerpc/stand/boot/Makefile
+++ b/sys/arch/powerpc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/01 21:01:45 rahnds Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:36 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
R= ..
@@ -8,7 +8,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
CFLAGS+= -DEXEC_ELF
NOMAN=
-STRIP=
+INSTALL_STRIP=
MAKEELF= makeelf
BINDIR= /usr/mdec
#OBJS+= note.o
diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index f4b8ae169d6..13034201f2f 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -4,7 +4,7 @@ R= ..
.PATH: ${.CURDIR}/${R}
PROG= boot
SRCS= srt0.S boot.c promdev.c dvma.c net.c netif_sun.c conf.c version.c
-STRIP=
+INSTALL_STRIP=
NOMAN= 1
BINDIR= /usr/mdec
LIBS!= cd ${.CURDIR}/${R}; ${MAKE} libdep
diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile
index 432056022e2..512405c14c6 100644
--- a/sys/arch/sparc/stand/bootxx/Makefile
+++ b/sys/arch/sparc/stand/bootxx/Makefile
@@ -6,7 +6,7 @@ PROG= bootxx
SRCS= srt0.S bootxx.c promdev.c dvma.c
KOBJS= __main.o bzero.o urem.o udiv.o
NOMAN= 1
-STRIP=
+INSTALL_STRIP=
BINDIR= /usr/mdec
CFLAGS= -DBOOTXX
diff --git a/sys/arch/sun3/stand/Makefile.inc b/sys/arch/sun3/stand/Makefile.inc
index d6d6a9b9450..30281168835 100644
--- a/sys/arch/sun3/stand/Makefile.inc
+++ b/sys/arch/sun3/stand/Makefile.inc
@@ -43,7 +43,7 @@ clean:
.if !target(install)
install: ${SA_PROG}.bin
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
.endif
diff --git a/sys/arch/sun3/stand/bootxx/Makefile b/sys/arch/sun3/stand/bootxx/Makefile
index c8e56066b72..44ef26b218c 100644
--- a/sys/arch/sun3/stand/bootxx/Makefile
+++ b/sys/arch/sun3/stand/bootxx/Makefile
@@ -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} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
.include <bsd.prog.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 23:49:46 +0000