diff options
| author | marcel <marcel@FreeBSD.org> | 2002-03-29 22:53:56 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2002-03-29 22:53:56 +0000 |
| commit | e27cdad86b33fbd4bf417817edfc51955552a318 (patch) | |
| tree | e3bb018da0a2f1550893c0ecb62e8e1dca655cde /sys/boot | |
| parent | 76fe441a7bf75d73962641b785f158b5cc9dc7f8 (diff) | |
| download | FreeBSD-src-e27cdad86b33fbd4bf417817edfc51955552a318.zip FreeBSD-src-e27cdad86b33fbd4bf417817edfc51955552a318.tar.gz | |
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 :-)
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/ia64/ski/Makefile | 5 | ||||
| -rw-r--r-- | sys/boot/ia64/skiload/Makefile | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index 4776228..1b8e032 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -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? diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile index 4776228..1b8e032 100644 --- a/sys/boot/ia64/skiload/Makefile +++ b/sys/boot/ia64/skiload/Makefile @@ -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? |
