From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 22 19:09:03 2015
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@nevdull.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B269158
 for <svn-soc-all@nevdull.freebsd.org>; Mon, 22 Jun 2015 19:09:03 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 1975AF0E
 for <svn-soc-all@FreeBSD.org>; Mon, 22 Jun 2015 19:09:03 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MJ92d9013600
 for <svn-soc-all@FreeBSD.org>; Mon, 22 Jun 2015 19:09:02 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MJ92RZ013576
 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 19:09:02 GMT
 (envelope-from clord@FreeBSD.org)
Date: Mon, 22 Jun 2015 19:09:02 GMT
Message-Id: <201506221909.t5MJ92RZ013576@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 clord@FreeBSD.org using -f
From: clord@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r287453 - in soc2015/clord/head/sys/boot: ficl ficl32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2015 19:09:03 -0000

Author: clord
Date: Mon Jun 22 19:09:01 2015
New Revision: 287453
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287453

Log:
  modify ficl Makefiles to use sources in sys/contrib/ficl rather than boot/ficl

Modified:
  soc2015/clord/head/sys/boot/ficl/Makefile
  soc2015/clord/head/sys/boot/ficl32/Makefile

Modified: soc2015/clord/head/sys/boot/ficl/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/ficl/Makefile	Mon Jun 22 18:18:15 2015	(r287452)
+++ soc2015/clord/head/sys/boot/ficl/Makefile	Mon Jun 22 19:09:01 2015	(r287453)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
 
-FICLDIR?=	${.CURDIR}
+FICLDIR?=	${.CURDIR}/../../contrib/ficl
 
 .if defined(FICL32)
 .PATH: ${FICLDIR}/${MACHINE_CPUARCH:S/amd64/i386/}

Modified: soc2015/clord/head/sys/boot/ficl32/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/ficl32/Makefile	Mon Jun 22 18:18:15 2015	(r287452)
+++ soc2015/clord/head/sys/boot/ficl32/Makefile	Mon Jun 22 19:09:01 2015	(r287453)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 FICL32=
-FICLDIR=	${.CURDIR}/../ficl
+FICLDIR=	${.CURDIR}/../../contrib/ficl
 
 .PATH:	${FICLDIR}
 
-.include "${FICLDIR}/Makefile"
+.include "${.CURDIR}/../Makefile"