PERFORCE change 110267 for review

[Marcel Moolenaar]

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

Change 110267 by marcel at 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