From 22e09e1bf0c4a5d77bced6958b0010af854be290 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Tue, 29 May 2001 01:48:06 +0000
Subject: Revert the ugly band-aide[tm] hack of rev 1.12. The offending
 loader.4th commit (rev 1.20) has been backed out.

---
 sys/boot/alpha/common/Makefile.common | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'sys/boot/alpha')

diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index ccfbbdc..72f8be2 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -40,7 +40,7 @@ CRT=		start.o
 STRIP=
 BINDIR?=	/boot
 
-all: ${BASE} ${.OBJDIR}/loader.4th
+all: ${BASE}
 
 vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
@@ -59,10 +59,6 @@ CLEANFILES+=	${BASE}.help
 ${BASE}.help: help.common help.alpha
 	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
-CLEANFILES+=	${.OBJDIR}/loader.4th
-${.OBJDIR}/loader.4th:  ${.CURDIR}/../../forth/loader.4th
-	grep -v 'dict' ${.ALLSRC} > ${.TARGET}
-
 beforeinstall:
 .if exists(${DESTDIR}/boot/${BASE})
 	mv ${DESTDIR}/boot/${BASE} ${DESTDIR}/boot/${BASE}.old
@@ -81,7 +77,7 @@ beforeinstall:
 		${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot
 .endif
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.OBJDIR}/loader.4th ${DESTDIR}/boot
+		${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-- 
cgit v1.1