Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Jan 2013 16:28:37 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r245886 - head/include/arpa
Message-ID:  <201301241628.r0OGSb7v001962@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301241628.r0OGSb7v001962>