diff options
| author | dteske <dteske@FreeBSD.org> | 2016-01-07 01:50:50 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2016-01-07 01:50:50 +0000 |
| commit | e80b4985ee36108fe5b4503bca02541c3faa000b (patch) | |
| tree | 3ed50d73cec44601a0eb7f95054a98919a7a9044 /sys/boot/powerpc | |
| parent | 915ffd5b63ab076a1e78799ec225a6fb3fcc6589 (diff) | |
| download | FreeBSD-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/powerpc')
| -rw-r--r-- | sys/boot/powerpc/ofw/Makefile | 8 | ||||
| -rw-r--r-- | sys/boot/powerpc/ps3/Makefile | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile index fbde1e7..83112d1 100644 --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -105,12 +105,6 @@ loader.help: help.common help.ofw .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 .include <bsd.prog.mk> diff --git a/sys/boot/powerpc/ps3/Makefile b/sys/boot/powerpc/ps3/Makefile index a90a92c..4c67c15 100644 --- a/sys/boot/powerpc/ps3/Makefile +++ b/sys/boot/powerpc/ps3/Makefile @@ -116,12 +116,6 @@ loader.help: help.common help.ps3 ${.CURDIR}/../../fdt/help.fdt .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 .include <bsd.prog.mk> |
