From 16ed9fd6bbe76ffe42b2620bd7523df770b5ef5f Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 31 Mar 2002 20:48:13 +0000 Subject: [PATCH] Only install the help file if we can find it. Use ${BASE}.help in both the condition and for the install. We expect to find the help file in ${.OBJDIR}. --- sys/boot/efi/loader/Makefile | 5 +---- sys/boot/ia64/efi/Makefile | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 0fc9328f85a..bbae7868713 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -71,12 +71,9 @@ ${BASE}.help: help.common help.efi > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/loader.help) +.if exists(${.OBJDIR}/${BASE}.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 # Other fragments still to be brought in from ../Makfile.booters? diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 0fc9328f85a..bbae7868713 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -71,12 +71,9 @@ ${BASE}.help: help.common help.efi > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/loader.help) +.if exists(${.OBJDIR}/${BASE}.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 # Other fragments still to be brought in from ../Makfile.booters? -- 2.45.2