From owner-svn-src-head@freebsd.org  Sat Sep 23 12:44:43 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CE16E04B8E;
 Sat, 23 Sep 2017 12:44:43 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 394F1725DA;
 Sat, 23 Sep 2017 12:44:43 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8NCig33037356;
 Sat, 23 Sep 2017 12:44:42 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NCig1O037355;
 Sat, 23 Sep 2017 12:44:42 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201709231244.v8NCig1O037355@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Sat, 23 Sep 2017 12:44:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323952 - head/sys/boot/i386/libi386
X-SVN-Group: head
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: head/sys/boot/i386/libi386
X-SVN-Commit-Revision: 323952
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Sep 2017 12:44:43 -0000

Author: oshogbo
Date: Sat Sep 23 12:44:42 2017
New Revision: 323952
URL: https://svnweb.freebsd.org/changeset/base/323952

Log:
  After the r317886 support for TFTP and NFS can be enable simultaneously.
  
  The cleanup of this distinction was done in the r318988, but this Makefile
  was omitted.
  
  Submitted by:	kczekirda@

Modified:
  head/sys/boot/i386/libi386/Makefile

Modified: head/sys/boot/i386/libi386/Makefile
==============================================================================
--- head/sys/boot/i386/libi386/Makefile	Sat Sep 23 12:35:46 2017	(r323951)
+++ head/sys/boot/i386/libi386/Makefile	Sat Sep 23 12:44:42 2017	(r323952)
@@ -12,10 +12,10 @@ SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp
 .PATH:	${.CURDIR}/../../zfs
 SRCS+=	devicename_stubs.c
 
-# Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
-.else
+.endif
+.if defined(LOADER_NFS_SUPPORT)
 CFLAGS+=	-DLOADER_NFS_SUPPORT
 .endif