Page MenuHomeFreeBSD
Files F138085318

D3176.id7236.diff
No OneTemporary
Actions

D3176.id7236.diff
View Options

Index: sys/boot/i386/loader/Makefile
===================================================================
--- sys/boot/i386/loader/Makefile
+++ sys/boot/i386/loader/Makefile
@@ -110,12 +110,7 @@
.include "${.CURDIR}/../../forth/Makefile.inc"
FILES+= pcibios.4th
-.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
Index: sys/boot/mips/beri/loader/Makefile
===================================================================
--- sys/boot/mips/beri/loader/Makefile
+++ sys/boot/mips/beri/loader/Makefile
@@ -125,13 +125,7 @@
.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
.if defined(LOADER_USB_SUPPORT)
# Do garbage collection
Index: sys/boot/pc98/loader/Makefile
===================================================================
--- sys/boot/pc98/loader/Makefile
+++ sys/boot/pc98/loader/Makefile
@@ -90,12 +90,7 @@
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= ${.CURDIR}/../../i386/loader/loader.rc
-.endif
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+= menu.rc
-.endif
+FILES+= ${.CURDIR}/../../i386/loader/loader.rc menu.rc
# XXX crt0.o needs to be first for pxeboot(8) to work
OBJS= ${BTXCRT}
Index: sys/boot/powerpc/kboot/Makefile
===================================================================
--- sys/boot/powerpc/kboot/Makefile
+++ sys/boot/powerpc/kboot/Makefile
@@ -117,12 +117,6 @@
.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>
Index: sys/boot/powerpc/ofw/Makefile
===================================================================
--- sys/boot/powerpc/ofw/Makefile
+++ sys/boot/powerpc/ofw/Makefile
@@ -112,12 +112,6 @@
.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>
Index: sys/boot/powerpc/ps3/Makefile
===================================================================
--- sys/boot/powerpc/ps3/Makefile
+++ sys/boot/powerpc/ps3/Makefile
@@ -114,12 +114,6 @@
.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>
Index: sys/boot/sparc64/loader/Makefile
===================================================================
--- sys/boot/sparc64/loader/Makefile
+++ sys/boot/sparc64/loader/Makefile
@@ -99,12 +99,6 @@
.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>

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 29, 6:43 PM (15 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26351972
Default Alt Text
D3176.id7236.diff (3 KB)

Event Timeline