summaryrefslogtreecommitdiffstats
path: root/sys/boot/alpha
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-05-29 01:48:06 +0000
committerobrien <obrien@FreeBSD.org>2001-05-29 01:48:06 +0000
commit22e09e1bf0c4a5d77bced6958b0010af854be290 (patch)
treeed62ed9d53dd943954574c4008911b0ced01da7c /sys/boot/alpha
parentb61be3ee13fa5be779797ad05611705ec5913477 (diff)
downloadFreeBSD-src-22e09e1bf0c4a5d77bced6958b0010af854be290.zip
FreeBSD-src-22e09e1bf0c4a5d77bced6958b0010af854be290.tar.gz
Revert the ugly band-aide[tm] hack of rev 1.12.
The offending loader.4th commit (rev 1.20) has been backed out.
Diffstat (limited to 'sys/boot/alpha')
-rw-r--r--sys/boot/alpha/common/Makefile.common8
1 files changed, 2 insertions, 6 deletions
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 \
OpenPOWER on IntegriCloud