From owner-p4-projects  Sat Apr  6 15:19:43 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 180DC37B400; Sat,  6 Apr 2002 15:19:37 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 593A637B41B
	for <perforce@freebsd.org>; Sat,  6 Apr 2002 15:19:36 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g36NJaf13942
	for perforce@freebsd.org; Sat, 6 Apr 2002 15:19:36 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 6 Apr 2002 15:19:36 -0800 (PST)
Message-Id: <200204062319.g36NJaf13942@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 9240 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9240

Change 9240 by peter@peter_thunder on 2002/04/06 15:18:50

	install the rest of the loader support files.

Affected files ...

... //depot/projects/ia64/sys/boot/efi/loader/Makefile#10 edit

Differences ...

==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#10 (text+ko) ====

@@ -60,12 +60,14 @@
 
 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 @@
 		--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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message