From 56a4230d7d90fb05982c3f285faf62ad514d429a Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sun, 27 Apr 1997 20:57:09 +0000 Subject: 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. --- sys/arch/i386/boot.dos/Makefile | 4 ++-- sys/arch/i386/stand/biosboot/Makefile | 4 ++-- sys/arch/i386/stand/boot/Makefile | 4 ++-- sys/arch/i386/stand/mbr/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/arch/i386') 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 -- cgit v1.2.3