From ede9f03a1a89e4925318c01fe16da5b4d848d9de Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 29 Mar 2002 22:53:56 +0000
Subject: [PATCH] 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 :-)

---
 sys/boot/ia64/ski/Makefile     | 5 +----
 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 4776228af6d3..1b8e0324d0e6 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 4776228af6d3..1b8e0324d0e6 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?