From 87dc09342253f8d8a575d2c052d7815ab40f95de Mon Sep 17 00:00:00 2001 From: cgd Date: Fri, 12 Jun 1998 23:11:45 +0000 Subject: [PATCH] replace ${MACHINE} with mvme68k, so that these Makefiles can safely be run when MACHINE != mvme68k. --- sys/arch/mvme68k/stand/bootsd/Makefile | 8 ++++---- sys/arch/mvme68k/stand/bootst/Makefile | 10 +++++----- sys/arch/mvme68k/stand/bootxx/Makefile | 8 ++++---- sys/arch/mvme68k/stand/bugcrt/Makefile.inc | 4 ++-- sys/arch/mvme68k/stand/libbug/Makefile.inc | 4 ++-- sys/arch/mvme68k/stand/libsa/Makefile.inc | 4 ++-- sys/arch/mvme68k/stand/netboot/Makefile | 8 ++++---- sys/arch/mvme68k/stand/wrtvid/Makefile.inc | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile index 204501f97759..b98673816dfe 100644 --- a/sys/arch/mvme68k/stand/bootsd/Makefile +++ b/sys/arch/mvme68k/stand/bootsd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.2 1996/10/18 06:06:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1998/06/12 23:11:45 cgd Exp $ RELOC=0x3F0000 @@ -10,9 +10,9 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=bootsd -.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc" SRCS= boot.c conf.c version.c diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile index f80cdd123889..38fb28469ff8 100644 --- a/sys/arch/mvme68k/stand/bootst/Makefile +++ b/sys/arch/mvme68k/stand/bootst/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.4 1996/10/18 06:07:11 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1998/06/12 23:11:45 cgd Exp $ RELOC=0x3F0000 @@ -10,10 +10,10 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=stboot bootst bootst.bug -.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/wrtvid/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc" +.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc" +.include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc" SRCS= boot.c conf.c dev_tape.c rawfs.c version.c diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile index 325dc04e27a4..38cbb88af0c9 100644 --- a/sys/arch/mvme68k/stand/bootxx/Makefile +++ b/sys/arch/mvme68k/stand/bootxx/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $NetBSD: Makefile,v 1.2 1996/10/18 06:07:40 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1998/06/12 23:11:46 cgd Exp $ RELOC=0x3F0000 @@ -10,9 +10,9 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=bootxx -.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc" SRCS= bootxx.c conf.c version.c diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc index 7e29f5df9c63..1bf355ffe427 100644 --- a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc +++ b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.2 1997/05/07 07:15:45 mycroft Exp $ +# $NetBSD: Makefile.inc,v 1.3 1998/06/12 23:11:46 cgd Exp $ -BUG_CRT_DIR=${S}/arch/${MACHINE}/stand/bugcrt +BUG_CRT_DIR=${S}/arch/mvme68k/stand/bugcrt BUGCRT_DIR!=cd ${BUG_CRT_DIR}; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- diff --git a/sys/arch/mvme68k/stand/libbug/Makefile.inc b/sys/arch/mvme68k/stand/libbug/Makefile.inc index 4173a7a74887..48c661bc99a7 100644 --- a/sys/arch/mvme68k/stand/libbug/Makefile.inc +++ b/sys/arch/mvme68k/stand/libbug/Makefile.inc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.3 1997/05/07 07:15:46 mycroft Exp $ +# $NetBSD: Makefile.inc,v 1.4 1998/06/12 23:11:46 cgd Exp $ -LIB_BUG_DIR=${S}/arch/${MACHINE}/stand/libbug +LIB_BUG_DIR=${S}/arch/mvme68k/stand/libbug LIBBUG_DIR!=cd ${LIB_BUG_DIR}; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- diff --git a/sys/arch/mvme68k/stand/libsa/Makefile.inc b/sys/arch/mvme68k/stand/libsa/Makefile.inc index 9817bc9f61c5..78405795900b 100644 --- a/sys/arch/mvme68k/stand/libsa/Makefile.inc +++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.2 1997/05/07 07:15:47 mycroft Exp $ +# $NetBSD: Makefile.inc,v 1.3 1998/06/12 23:11:46 cgd Exp $ -LIB_SA_DIR=${S}/arch/${MACHINE}/stand/libsa +LIB_SA_DIR=${S}/arch/mvme68k/stand/libsa LIBSA_DIR!=cd ${LIB_SA_DIR}; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile index dde9bf461e12..24a7981dd751 100644 --- a/sys/arch/mvme68k/stand/netboot/Makefile +++ b/sys/arch/mvme68k/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1996/10/18 06:05:55 thorpej Exp $ +# $NetBSD: Makefile,v 1.4 1998/06/12 23:11:46 cgd Exp $ RELOC=0x3F0000 @@ -9,9 +9,9 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=netboot netboot.bin -.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc" +.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc" SRCS= boot.c conf.c version.c devopen.c dev_net.c SRCS+= if_ie.c if_le.c diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc index 76560743d46e..ba8f916a6318 100644 --- a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc +++ b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.2 1997/05/07 07:15:48 mycroft Exp $ +# $NetBSD: Makefile.inc,v 1.3 1998/06/12 23:11:46 cgd Exp $ -WRTVID_BASE_DIR=${S}/arch/${MACHINE}/stand/wrtvid +WRTVID_BASE_DIR=${S}/arch/mvme68k/stand/wrtvid WRTVID_DIR!=cd ${WRTVID_BASE_DIR}; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-