Index: projects/lua-bootloader/sys/boot/liblua/Makefile
===================================================================
--- projects/lua-bootloader/sys/boot/liblua/Makefile	(revision 280962)
+++ projects/lua-bootloader/sys/boot/liblua/Makefile	(revision 280963)
@@ -1,45 +1,50 @@
 # $FreeBSD$
 
-LUA_PATH=	${.CURDIR}/../../contrib/lua
+LUA_PATH?=	${.CURDIR}/../../contrib/lua
 .PATH:		${LUA_PATH}/src
 
+LIBLUA_PATH?=	${.CURDIR}/../liblua
+.PATH:		${LIBLUA_PATH}
+
+COMMON_PATH?=	${.CURDIR}/../common
+
 LIB=		lua
 INTERNALLIB=
 
 # Core Lua.
 SRCS=	lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c \
 	lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c \
         ltm.c lundump.c lvm.c lzio.c
 SRCS+=	lauxlib.c lbaselib.c lbitlib.c ldblib.c lstrlib.c ltablib.c loadlib.c \
 	linit.c
 
 # Our utilities.
 SRCS+=	lstd.c lutils.c
 
 WARNS=	3
 
 CFLAGS+= -ffreestanding -nostdlib
 CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE
-CFLAGS+= -I${.CURDIR}/../liblua -I${LUA_PATH} -I${.CURDIR}/../common
+CFLAGS+= -I${LIBLUA_PATH} -I${LUA_PATH} -I${COMMON_PATH}
 
 .if ${MACHINE_CPUARCH} == "i386" || \
     (${MACHINE_CPUARCH} == "amd64" && defined(LUA32))
 CFLAGS+=        -march=i386
 CFLAGS.gcc+=    -mpreferred-stack-boundary=2
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=        -mno-red-zone
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=        -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 .if defined(LUA32)
 CFLAGS+=        -m32
 .else
 CFLAGS+=        -fPIC
 .endif
 .endif
 
 .include <bsd.lib.mk>
Index: projects/lua-bootloader/sys/boot/userboot/Makefile
===================================================================
--- projects/lua-bootloader/sys/boot/userboot/Makefile	(revision 280962)
+++ projects/lua-bootloader/sys/boot/userboot/Makefile	(revision 280963)
@@ -1,8 +1,19 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
+.include <src.opts.mk>
 
-SUBDIR=		ficl libstand test zfs userboot
+SUBDIR=		libstand
+
+.if ${MK_FORTH} != "no"
+SUBDIR+=	ficl
+.endif
+
+.if ${MK_LUA} != "no"
+SUBDIR+=	liblua
+.endif
+
+SUBDIR+=	test zfs userboot
 
 .include <bsd.subdir.mk>
 
Index: projects/lua-bootloader/sys/boot/userboot/liblua/Makefile
===================================================================
--- projects/lua-bootloader/sys/boot/userboot/liblua/Makefile	(nonexistent)
+++ projects/lua-bootloader/sys/boot/userboot/liblua/Makefile	(revision 280963)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+LUA_PATH=	${.CURDIR}/../../../contrib/lua
+LIBLUA_PATH=	${.CURDIR}/../../liblua
+COMMON_PATH=	${.CURDIR}/../../common
+
+.include "${LIBLUA_PATH}/Makefile"

Property changes on: projects/lua-bootloader/sys/boot/userboot/liblua/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/lua-bootloader/sys/boot/userboot/userboot/Makefile
===================================================================
--- projects/lua-bootloader/sys/boot/userboot/userboot/Makefile	(revision 280962)
+++ projects/lua-bootloader/sys/boot/userboot/userboot/Makefile	(revision 280963)
@@ -1,68 +1,75 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 MK_SSP=		no
 
 SHLIB_NAME=	userboot.so
 NO_CTF=		yes
 STRIP=
 LIBDIR=		/boot
 
 SRCS=		autoload.c
 SRCS+=		biossmap.c
 SRCS+=		bootinfo.c
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
 SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c
 SRCS+=		elf64_freebsd.c
 SRCS+=		host.c
 SRCS+=		main.c
 SRCS+=		userboot_cons.c
 SRCS+=		userboot_disk.c
 SRCS+=		vers.c
 
 CFLAGS+=	-Wall
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I${.CURDIR}/../../..
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
 CFLAGS+=	-ffreestanding -I.
 
 LDFLAGS+=	-nostdlib -Wl,-Bsymbolic
 
 NEWVERSWHAT=	"User boot" ${MACHINE_CPUARCH}
 
 vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 
 CLEANFILES=	vers.c
 
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=        -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386
 CFLAGS+=	-DBF_DICTSIZE=15000
 LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 .endif
 
+.if ${MK_LUA} != "no"
+BOOT_LUA=	yes
+CFLAGS+=        -DBOOT_LUA -I${.CURDIR}/../../liblua \
+		-I${.CURDIR}/../../../contrib/lua
+LIBLUA=		${.OBJDIR}/../liblua/liblua.a
+.endif
+
 LIBSTAND=	${.OBJDIR}/../libstand/libstand.a
 
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
 LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
-LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
+DPADD+=		${LIBLUA} ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} 
+LDADD+=		${LIBLUA} ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
 
 .include <bsd.lib.mk>