Fix the beforeinstall target. We install ${PROG}.help if loader.help

exists, otherwise we install it anyway. I interpret this as a very
high desire to install ${PROG}.help. Alas, ${PROG}.help doesn't exist
at the moment and neither does loader.help, so in practice this just
doesn't work, no matter how you interpret it. The compromise is to
install ${PROG}.help IFF it exists. I realize we lost creativity with
this commit, but style should have been preserved, AFAICT :-)
This commit is contained in:
Marcel Moolenaar 2002-03-29 22:53:56 +00:00
parent 4cd0119367
commit ede9f03a1a
2 changed files with 2 additions and 8 deletions

View File

@ -69,12 +69,9 @@ ${PROG}.help: help.common help.efi
> ${.TARGET}
beforeinstall:
.if exists(${.OBJDIR}/loader.help)
.if exists(${.OBJDIR}/${PROG}.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${PROG}.help ${DESTDIR}/boot
.else
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/${PROG}.help ${DESTDIR}/boot
.endif
# Other fragments still to be brought in from ../Makfile.booters?

View File

@ -69,12 +69,9 @@ ${PROG}.help: help.common help.efi
> ${.TARGET}
beforeinstall:
.if exists(${.OBJDIR}/loader.help)
.if exists(${.OBJDIR}/${PROG}.help)
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.OBJDIR}/${PROG}.help ${DESTDIR}/boot
.else
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/${PROG}.help ${DESTDIR}/boot
.endif
# Other fragments still to be brought in from ../Makfile.booters?