diff options
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 24 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/Makefile | 24 |
2 files changed, 40 insertions, 8 deletions
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 66415a7..c871a39 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -60,12 +60,14 @@ CLEANFILES+= machine CRT= start.o -all: ${PROG} +all: ${BASE} vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ${CC} -c vers.c +${BASE}: ${BASE}.efi ${BASE}.help + ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ -j .hash \ @@ -79,15 +81,29 @@ ${BASE}.efi: ${BASE}.sym --target=efi-app-${MACHINE_ARCH} \ ${BASE}.sym ${BASE}.efi -${BASE}.help: help.common help.efi +${BASE}.help: help.common cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \ > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/${BASE}.help) +.if exists(${.OBJDIR}/loader.help) + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot +.else + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/${BASE}.help ${DESTDIR}/boot +.endif +.if !exists(${DESTDIR}/boot/loader.rc) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot + ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot .endif + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.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 \ + ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults + # Other fragments still to be brought in from ../Makfile.booters? start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 66415a7..c871a39 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -60,12 +60,14 @@ CLEANFILES+= machine CRT= start.o -all: ${PROG} +all: ${BASE} vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ${CC} -c vers.c +${BASE}: ${BASE}.efi ${BASE}.help + ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ -j .hash \ @@ -79,15 +81,29 @@ ${BASE}.efi: ${BASE}.sym --target=efi-app-${MACHINE_ARCH} \ ${BASE}.sym ${BASE}.efi -${BASE}.help: help.common help.efi +${BASE}.help: help.common cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \ > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/${BASE}.help) +.if exists(${.OBJDIR}/loader.help) + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot +.else + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/${BASE}.help ${DESTDIR}/boot +.endif +.if !exists(${DESTDIR}/boot/loader.rc) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot + ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot .endif + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.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 \ + ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults + # Other fragments still to be brought in from ../Makfile.booters? start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S |
