From owner-svn-src-projects@FreeBSD.ORG  Thu Mar 26 19:13:55 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8C6B3C33;
 Thu, 26 Mar 2015 19:13:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77D7AAE1;
 Thu, 26 Mar 2015 19:13:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2QJDtBX037941;
 Thu, 26 Mar 2015 19:13:55 GMT (envelope-from rpaulo@FreeBSD.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2QJDtTM037940;
 Thu, 26 Mar 2015 19:13:55 GMT (envelope-from rpaulo@FreeBSD.org)
Message-Id: <201503261913.t2QJDtTM037940@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to
 rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 26 Mar 2015 19:13:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r280708 - projects/lua-bootloader/sys/boot/i386/loader
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Mar 2015 19:13:55 -0000

Author: rpaulo
Date: Thu Mar 26 19:13:54 2015
New Revision: 280708
URL: https://svnweb.freebsd.org/changeset/base/280708

Log:
  i386/loader: add the necessary glue for lua.

Modified:
  projects/lua-bootloader/sys/boot/i386/loader/Makefile

Modified: projects/lua-bootloader/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/i386/loader/Makefile	Thu Mar 26 18:51:00 2015	(r280707)
+++ projects/lua-bootloader/sys/boot/i386/loader/Makefile	Thu Mar 26 19:13:54 2015	(r280708)
@@ -50,6 +50,8 @@ LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 
 .if ${MK_LUA} != "no"
 BOOT_LUA=	yes
+CFLAGS+=	-DBOOT_LUA -I${.CURDIR}/../../../contrib/lua
+CFLAGS+=	-I${.CURDIR}/../../liblua
 .if ${MACHINE_CPUARCH} == "amd64"
 LIBLUA=		${.OBJDIR}/../../liblua32/liblua.a
 .else
@@ -130,6 +132,8 @@ FILES+= menu.rc
 .endif
 .endif
 .if defined(BOOT_LUA)
+# 'forth' is included just for loader.conf.
+.PATH: ${.CURDIR}/../../forth ${.CURDIR}/../../lua
 FILES+=	config.lua core.lua drawer.lua password.lua screen.lua
 .if !exists(${DESTDIR}/boot/loader.lua)
 FILES+=	loader.lua