summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/boot/alpha/common/Makefile.common4
-rw-r--r--sys/boot/i386/loader/Makefile4
-rw-r--r--sys/boot/pc98/loader/Makefile4
-rw-r--r--sys/boot/powerpc/loader/Makefile4
-rw-r--r--sys/boot/powerpc/ofw/Makefile4
5 files changed, 5 insertions, 15 deletions
diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index b3575fb93714..85467a6a6ab9 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -39,6 +39,7 @@ CFLAGS+= -I${.CURDIR}/..
CRT= start.o
STRIP=
BINDIR?= /boot
+INSTALLFLAGS?= -b
all: ${BASE} ${BASE}.help
@@ -58,9 +59,6 @@ ${BASE}.help: help.common help.alpha
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
beforeinstall:
-.if exists(${DESTDIR}/boot/${BASE})
- mv ${DESTDIR}/boot/${BASE} ${DESTDIR}/boot/${BASE}.old
-.endif
.ifdef INSTALL_HELP
.if exists(${.OBJDIR}/${BASE}.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 522323e0eb39..1b203fc57034 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -6,6 +6,7 @@ PROG= ${BASE}
STRIP=
NEWVERSWHAT= "bootstrap loader" i386
BINDIR?= /boot
+INSTALLFLAGS= -b
# architecture-specific loader code
SRCS= main.c conf.c
@@ -94,9 +95,6 @@ ${BASE}.help: help.common help.i386
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
beforeinstall:
-.if exists(${DESTDIR}/boot/loader)
- mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old
-.endif
.if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 3812aff58770..1485bb41e478 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -6,6 +6,7 @@ PROG= ${BASE}
STRIP=
NEWVERSWHAT= "bootstrap loader" pc98
BINDIR?= /boot
+INSTALLFLAGS= -b
CFLAGS+= -DPC98
@@ -97,9 +98,6 @@ ${BASE}.help: help.common help.i386
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
beforeinstall:
-.if exists(${DESTDIR}/boot/loader)
- mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old
-.endif
.if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile
index f962170f5365..cd8ccaffe1e4 100644
--- a/sys/boot/powerpc/loader/Makefile
+++ b/sys/boot/powerpc/loader/Makefile
@@ -6,6 +6,7 @@ NOMAN=
STRIP=
NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC
BINDIR?= /boot
+INSTALLFLAGS= -b
LOADER_DISK_SUPPORT?= yes
LOADER_NET_SUPPORT?= yes
@@ -76,9 +77,6 @@ ${BASE}.help: help.common help.ofw
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
beforeinstall:
-.if exists(${DESTDIR}/boot/loader)
- mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old
-.endif
.if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index f962170f5365..cd8ccaffe1e4 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -6,6 +6,7 @@ NOMAN=
STRIP=
NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC
BINDIR?= /boot
+INSTALLFLAGS= -b
LOADER_DISK_SUPPORT?= yes
LOADER_NET_SUPPORT?= yes
@@ -76,9 +77,6 @@ ${BASE}.help: help.common help.ofw
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
beforeinstall:
-.if exists(${DESTDIR}/boot/loader)
- mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old
-.endif
.if exists(${.OBJDIR}/loader.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${BASE}.help ${DESTDIR}/boot