From owner-svn-src-all@FreeBSD.ORG  Thu Jan 24 16:28:37 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E173F25F;
 Thu, 24 Jan 2013 16:28:37 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CA53F35D;
 Thu, 24 Jan 2013 16:28:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OGSbNi001963;
 Thu, 24 Jan 2013 16:28:37 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OGSb7v001962;
 Thu, 24 Jan 2013 16:28:37 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301241628.r0OGSb7v001962@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 24 Jan 2013 16:28:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245886 - head/include/arpa
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jan 2013 16:28:38 -0000

Author: brooks
Date: Thu Jan 24 16:28:37 2013
New Revision: 245886
URL: http://svnweb.freebsd.org/changeset/base/245886

Log:
  Don't install telnet.h if it will be installed by libtelnet.

Modified:
  head/include/arpa/Makefile

Modified: head/include/arpa/Makefile
==============================================================================
--- head/include/arpa/Makefile	Thu Jan 24 15:55:24 2013	(r245885)
+++ head/include/arpa/Makefile	Thu Jan 24 16:28:37 2013	(r245886)
@@ -1,7 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_OBJ=
-INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
+INCS=	ftp.h inet.h nameser.h nameser_compat.h tftp.h
+.if ${MK_TELNET} == "NO"
+INCS+=	telnet.h
+.endif
 INCSDIR=${INCLUDEDIR}/arpa
 
 .include <bsd.prog.mk>