summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2016-01-07 01:50:50 +0000
committerdteske <dteske@FreeBSD.org>2016-01-07 01:50:50 +0000
commite80b4985ee36108fe5b4503bca02541c3faa000b (patch)
tree3ed50d73cec44601a0eb7f95054a98919a7a9044 /sys/boot/i386
parent915ffd5b63ab076a1e78799ec225a6fb3fcc6589 (diff)
downloadFreeBSD-src-e80b4985ee36108fe5b4503bca02541c3faa000b.zip
FreeBSD-src-e80b4985ee36108fe5b4503bca02541c3faa000b.tar.gz
MFC r286368: Remove guards around overwriting loader.rc and menu.rc
There have been .local version of each for user modifications for some time This allows users to receive future updates to these files PR: 183765 Differential Revision: https://reviews.freebsd.org/D3176 Submitted by: Bertram Scharpf, Nikolai Lifanov (patch) Reviewed by: dteske, loos, eadler Approved by: bapt (mentor) Relnotes: yes Sponsored by: ScaleEngine Inc.
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/loader/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 9f2f1b2..1ab909d3 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -108,12 +108,7 @@ FILESMODE_${LOADER}= ${BINMODE} -b
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
-.endif
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= loader.rc menu.rc
.endif
# XXX crt0.o needs to be first for pxeboot(8) to work
OpenPOWER on IntegriCloud