From owner-p4-projects@FreeBSD.ORG  Tue Nov 21 16:18:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F1E9C16A826; Tue, 21 Nov 2006 16:18:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 15EAB16A765
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 16:18:16 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 50CA343D5A
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 16:16:55 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kALGH6kE045629
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 16:17:06 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALGH60r045626
	for perforce@freebsd.org; Tue, 21 Nov 2006 16:17:06 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 21 Nov 2006 16:17:06 GMT
Message-Id: <200611211617.kALGH60r045626@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110267 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Nov 2006 16:18:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=110267

Change 110267 by marcel@marcel_nfs on 2006/11/20 00:07:25

	Recurse into the efi directory.

Affected files ...

.. //depot/projects/ia64/sys/boot/i386/Makefile#8 edit
.. //depot/projects/ia64/sys/boot/i386/efi/Makefile#2 edit

Differences ...

==== //depot/projects/ia64/sys/boot/i386/Makefile#8 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $
 
-SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader
+SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader efi
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr

==== //depot/projects/ia64/sys/boot/i386/efi/Makefile#2 (text+ko) ====

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+NO_MAN=
+
 .include <bsd.own.mk>
 
 PROG=		loader.sym
@@ -27,21 +29,15 @@
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 
-.PATH: ${.CURDIR}/../../forth
-FILES=	loader.efi loader.help loader.4th support.4th loader.conf
+FILES=	loader.efi
 FILESMODE_loader.efi=	${BINMODE}
-FILESDIR_loader.conf=	/boot/defaults
-
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+=		loader.rc
-.endif
 
 LDSCRIPT=	${.CURDIR}/ldscript.ia32
 LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic
 
 ${PROG}:	${LDSCRIPT}
 
-CLEANFILES=	vers.c loader.efi loader.help
+CLEANFILES=	vers.c loader.efi
 
 NEWVERSWHAT=	"EFI loader" ia32
 
@@ -60,10 +56,6 @@
 	    -j .rela.dyn -j .reloc -j .sdata -j .text \
 	    --target=efi-app-ia32 ${.ALLSRC} ${.TARGET}
 
-loader.help: help.common help.i386
-	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
-	    > ${.TARGET}
-
 LIBEFI=		${.OBJDIR}/../../efi/libefi/libefi.a
 LIBI386=	${.OBJDIR}/../libi386/libi386.a