Date: Fri, 15 Mar 2013 22:26:19 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> 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 Message-ID: <201303152226.r2FMQJjm093399@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303152226.r2FMQJjm093399>