From abf0a9b802568527a34d1807e4880de7abfbe7ec Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Sun, 4 Jul 1993 14:02:53 +0000
Subject: [PATCH] do the right thing, so things aren't built in /usr/src/sys

---
 sys/Makefile                |  5 +++++
 sys/arch/i386/Makefile      | 13 +++++++++----
 sys/arch/i386/boot/Makefile | 34 +++++++++++++++-------------------
 3 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 sys/Makefile

diff --git a/sys/Makefile b/sys/Makefile
new file mode 100644
index 000000000000..f6674cb88aa5
--- /dev/null
+++ b/sys/Makefile
@@ -0,0 +1,5 @@
+#	$Id: Makefile,v 1.1 1993/07/04 14:02:53 cgd Exp $
+
+SUBDIR+= arch/${MACHINE}
+
+.include <bsd.subdir.mk>
diff --git a/sys/arch/i386/Makefile b/sys/arch/i386/Makefile
index 19ddd3584de1..8a95c60e24b5 100644
--- a/sys/arch/i386/Makefile
+++ b/sys/arch/i386/Makefile
@@ -1,10 +1,13 @@
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$Id: Makefile,v 1.2 1993/05/22 07:59:30 cgd Exp $
+#	$Id: Makefile,v 1.3 1993/07/04 14:03:00 cgd Exp $
 
-# Makefile for i386 tags file
+# Makefile for i386 tags file and boot blocks
 
-all:
-	@echo "make tags or links only"
+NOPROG=	noprog
+NOMAN=	noman
+NOOBJ=	noobj
+
+SUBDIR=	boot
 
 TI386=	../i386/tags
 SI386=	../i386/i386/*.[ch] ../i386/include/*.h ../i386/isa/*.[ch]
@@ -23,3 +26,5 @@ tags:
 links:
 	-for i in ${DI386}; do \
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
+
+.include <bsd.prog.mk>
diff --git a/sys/arch/i386/boot/Makefile b/sys/arch/i386/boot/Makefile
index b53bf2cdf22c..8ed0b9ce5462 100644
--- a/sys/arch/i386/boot/Makefile
+++ b/sys/arch/i386/boot/Makefile
@@ -25,7 +25,10 @@
 #
 # HISTORY
 # $Log: Makefile,v $
-# Revision 1.4  1993/06/18 08:03:14  cgd
+# Revision 1.5  1993/07/04 14:03:03  cgd
+# do the right thing, so things aren't built in /usr/src/sys
+#
+# Revision 1.4  1993/06/18  08:03:14  cgd
 # install floppy boot block, too.
 #
 # Revision 1.3  1993/06/08  03:36:39  deraadt
@@ -46,9 +49,12 @@
 # julian@tfs.com
 #
 
-CFLAGS	= -O -DDO_BAD144
+NOPROG=	noprog
+NOMAN=	noman
+
+CFLAGS	= -O -DDO_BAD144 -I${.CURDIR}
 LIBS= -lc
-INC= -I../..
+INC= -I${.CURDIR}/../..
 
 # start.o should be first, table.o should be second
 OBJS = start.o table.o boot2.o boot.o asm.o bios.o io.o disk.o sys.o
@@ -61,7 +67,7 @@ OBJS = start.o table.o boot2.o boot.o asm.o bios.o io.o disk.o sys.o
 	-@trap "/bin/rm -f $*.i $*.s; exit 0" 0 1 2 3 10 15; \
 	$(CC)  $(CFLAGS) $(INC) -S $<;	\
 	if [ $$? != 0 ]; then :; else \
-		sed -f boot.sed $*.s > $*.i;	\
+		sed -f ${.CURDIR}/boot.sed $*.s > $*.i;	\
 		$(AS) $*.i -o $@; \
 	fi
 
@@ -69,7 +75,7 @@ OBJS = start.o table.o boot2.o boot.o asm.o bios.o io.o disk.o sys.o
 	@echo $(AS) -o $*.o $<
 	-@trap "/bin/rm -f $*.i X$*.c; exit 0" 0 1 2 3 10 15; \
 	/bin/rm -f X$*.c;	\
-	ln $*.s X$*.c;	\
+	ln -s $< X$*.c;	\
 	$(CC) -E $(CFLAGS) X$*.c > $*.i;	\
 	if [ $$? != 0 ]; then :;	\
 	else \
@@ -81,7 +87,7 @@ boot: boot.sed $(OBJS)
 	$(LD) -N -T 0 -o boot $(OBJS) $(LIBS)
 	cp boot boot.sym
 	@strip boot
-	@sh ./rmaouthdr boot boot.tmp
+	@sh ${.CURDIR}/rmaouthdr boot boot.tmp
 	@mv -f boot.tmp boot
 	@ls -l boot
 
@@ -117,22 +123,12 @@ sd:	/usr/mdec/bootsd /usr/mdec/sdboot
 wd:	/usr/mdec/bootwd /usr/mdec/wdboot
 fd:	/usr/mdec/bootfd /usr/mdec/fdboot
 
-#wd0:	/usr/mdec/bootwd /usr/mdec/wdboot
-#	disklabel -r -w wd0 julian julian5 /usr/mdec/wdboot /usr/mdec/bootwd
-#
-
-#sd0:	/usr/mdec/bootsd /usr/mdec/sdboot
-#	disklabel -r -w sd0 XT-8760 scsitest /usr/mdec/sdboot /usr/mdec/bootsd
-#
-
-#fd0:	/usr/mdec/bootfd /usr/mdec/fdboot
-#	disklabel -r -w fd0 floppy5 bootflpy /usr/mdec/fdboot /usr/mdec/bootfd
-#
+all: biosboot bootbios
 
 # Beware: the floppy boot block is *slow*...
 install: wd sd fd
 
-clean:
+clean cleandir:
 	/bin/rm -f *.o *.d boot bootbios biosboot boot.sym
 
-
+.include <bsd.prog.mk>