From owner-svn-src-stable-9@FreeBSD.ORG  Fri Mar 15 22:26:19 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D5D2FFC;
 Fri, 15 Mar 2013 22:26:19 +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 BD9F8CC7;
 Fri, 15 Mar 2013 22:26:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FMQJbI093400;
 Fri, 15 Mar 2013 22:26:19 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FMQJjm093399;
 Fri, 15 Mar 2013 22:26:19 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201303152226.r2FMQJjm093399@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 15 Mar 2013 22:26:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r248357 - stable/9/include/arpa
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 22:26:19 -0000

Author: brooks
Date: Fri Mar 15 22:26:19 2013
New Revision: 248357
URL: http://svnweb.freebsd.org/changeset/base/248357

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

Modified:
  stable/9/include/arpa/Makefile
Directory Properties:
  stable/9/include/arpa/   (props changed)

Modified: stable/9/include/arpa/Makefile
==============================================================================
--- stable/9/include/arpa/Makefile	Fri Mar 15 22:24:34 2013	(r248356)
+++ stable/9/include/arpa/Makefile	Fri Mar 15 22:26:19 2013	(r248357)
@@ -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>