2 files changed, 15 insertions, 3 deletions
diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index 1da307b9927..e4d6368179c 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 1998/06/23 18:46:40 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 1998/06/27 02:59:20 mickey Exp $
 
 CFLAGS=${DEBUG} -O2 -Wall -Werror
 CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -21,6 +21,7 @@ CLEANFILES+=	machine
 	@([ -h machine ] || ln -s $(S)/arch/hppa/include machine)
 .endif
 
+.if 0
 .if $(CC) != $(HOSTCC)
 .S.o .s.o:
 	@echo "${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \
@@ -37,7 +38,7 @@ CLEANFILES+=	machine
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 .endif
-
+.endif
 .if exists(${SADIR}/libsa/libsa.a)
 LIBSA=${SADIR}/libsa/libsa.a
 .else
@@ -53,6 +54,11 @@ LIBZ=${SADIR}/libz/libz.a
 .else
 LIBZ=${SADIR}/libz/${__objdir}/libz.a
 .endif
+.if exists(${SADIR}/mkboot/mkboot)
+MKBOOT=${SADIR}/mkboot/mkboot
+.else
+MKBOOT=${SADIR}/mkboot/${__objdir}/mkboot
+.endif
 
 # NO_NET=no_net
 BINDIR=	/usr/mdec
diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile
index 26145f9984c..98f115cbf1e 100644
--- a/sys/arch/hppa/stand/boot/Makefile
+++ b/sys/arch/hppa/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1998/06/23 18:46:41 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 1998/06/27 02:59:21 mickey Exp $
 
 PROG=	boot
 SRCS=	srt0.S boot.c cmd.c vars.c bootarg.c conf.c
@@ -13,12 +13,18 @@ MAN=	boot.8
 MLINKS=	boot.8 boot.conf.8
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
+CLEANFILES+=	boot.lif
 
 LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
 DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
 
 .PATH:	${S}/stand/boot
 
+all:	boot.lif
+
+boot.lif:	${PROG}
+	${MKBOOT} -v ${PROG} boot.lif
+
 ${PROG}: $(OBJS) $(DPADD)
 	$(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
 	@${SIZE} $(PROG)