3 files changed, 15 insertions, 21 deletions
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index ad2c438..979ea4d 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/09/14 18:27:05 msmith Exp $
+#	$Id: Makefile,v 1.3 1998/09/17 23:52:04 msmith Exp $
 
 M4?=	m4
 
@@ -16,13 +16,8 @@ btx: btx.o
 .endif
 
 btx.o: btx.m4 btx.s
-	${M4} btx.m4 btx.s | ${AS} ${AFLAGS} -o ${.TARGET}
+	(cd ${.CURDIR}; ${M4} btx.m4 btx.s) | ${AS} ${AFLAGS} -o ${.TARGET}
 
-clean:
-	rm -f btx btx.out btx.o
+CLEANFILES+= btx btx.out btx.o
 
-depend:
-
-cleandepend:
-
-install:
+.include <bsd.prog.mk>
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index fdb623a..9cecaad 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/09/14 18:27:05 msmith Exp $
+#	$Id: Makefile,v 1.3 1998/09/17 23:52:04 msmith Exp $
 
 ORG=0x100000
 
@@ -14,13 +14,8 @@ btxldr: btxldr.o
 .endif
 
 btxldr.o: btxldr.s
-	${AS} ${AFLAGS} -o ${.TARGET} btxldr.s
+	${AS} ${AFLAGS} -o ${.TARGET} ${.CURDIR}/btxldr.s
 
-clean:
-	rm -f btxldr btxldr.out btxldr.o
+CLEANFILES+= btxldr btxldr.out btxldr.o
 
-depend:
-
-cleandepend:
-
-install:
+.include <bsd.prog.mk>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 7c40a44..51ef55e 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1998/09/18 02:03:29 msmith Exp $
+# $Id: Makefile,v 1.5 1998/09/19 01:35:53 msmith Exp $
 
 BASE=		loader
 PROG=		${BASE}
@@ -18,7 +18,7 @@ CFLAGS+=	-DVERBOSE_LS
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
 .include	<${.CURDIR}/../../common/Makefile.inc>
-CFLAGS+=	-I${.CURDIR}/../../common
+CFLAGS+=	-I${.CURDIR}/../../common -I.
 
 CLEANFILES+=	vers.c vers.o ${BASE}.list setdef0.o setdef1.o setdefs.h \
 		gensetdefs.o gensetdefs ${BASE}.bin
@@ -35,11 +35,15 @@ LIBSTAND=	-lstand
 #LIBSTAND=	${.CURDIR}/../../../lib/libstand/libstand.a
 
 # BTX components
+.if exists(${.OBJDIR}/../btx)
+BTXDIR=		${.OBJDIR}/../btx
+.else
 BTXDIR=		${.CURDIR}/../btx
+.endif
 BTXLDR=		${BTXDIR}/btxldr/btxldr
 BTXKERN=	${BTXDIR}/btx/btx
 BTXCRT=		${BTXDIR}/lib/crt0.o
-CFLAGS+=	-I${BTXDIR}/lib
+CFLAGS+=	-I${.CURDIR}/../btx/lib
 
 # BTX is expecting ELF components
 CFLAGS+=	-elf