From owner-svn-src-projects@FreeBSD.ORG  Thu Mar 26 06:00:43 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 20DC7D83;
 Thu, 26 Mar 2015 06:00:43 +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 0C1609B;
 Thu, 26 Mar 2015 06:00:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q60gin061670;
 Thu, 26 Mar 2015 06:00:42 GMT (envelope-from rpaulo@FreeBSD.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q60gs2061669;
 Thu, 26 Mar 2015 06:00:42 GMT (envelope-from rpaulo@FreeBSD.org)
Message-Id: <201503260600.t2Q60gs2061669@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 06:00:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r280673 - 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 06:00:43 -0000

Author: rpaulo
Date: Thu Mar 26 06:00:42 2015
New Revision: 280673
URL: https://svnweb.freebsd.org/changeset/base/280673

Log:
  i386/loader: install lua files.

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 06:00:22 2015	(r280672)
+++ projects/lua-bootloader/sys/boot/i386/loader/Makefile	Thu Mar 26 06:00:42 2015	(r280673)
@@ -114,14 +114,14 @@ FILES=	${LOADER}
 FILESMODE_${LOADER}= ${BINMODE} -b
 
 .if !defined(LOADER_ONLY)
+FILES+= loader.conf
+.if defined(BOOT_FORTH)
 .PATH: ${.CURDIR}/../../forth
-FILES+=	loader.help loader.4th support.4th loader.conf
+FILES+=	loader.help loader.4th support.4th
 FILES+= screen.4th frames.4th beastie.4th
 FILES+= brand.4th check-password.4th color.4th delay.4th
 FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
 FILES+= pcibios.4th
-FILESDIR_loader.conf=	/boot/defaults
-
 .if !exists(${DESTDIR}/boot/loader.rc)
 FILES+=	loader.rc
 .endif
@@ -129,6 +129,17 @@ FILES+=	loader.rc
 FILES+= menu.rc
 .endif
 .endif
+.if defined(BOOT_LUA)
+FILES+=	config.lua core.lua drawer.lua password.lua screen.lua
+.if !exists(${DESTDIR}/boot/loader.lua)
+FILES+=	loader.lua
+.endif
+.if !exists(${DESTDIR}/boot/menu.lua)
+FILES+= menu.lua
+.endif
+.endif
+FILESDIR_loader.conf=	/boot/defaults
+.endif
 
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT}