svn commit: r312055 - in stable/10/usr.sbin/bsnmpd/modules: snmp_atm snmp_hast snmp_hostres snmp_mibII snmp_target snmp_usm snmp_vacm

[Ngie Cooper]

Author: ngie
Date: Fri Jan 13 09:07:25 2017
New Revision: 312055
URL: https://svnweb.freebsd.org/changeset/base/312055

Log:
  MFC r311739:
  
  Use SRCTOP instead of spelling out the full path with .CURDIR
  
  This helps condense the output for CFLAGS and .PATH

Modified:
  stable/10/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_target/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
  stable/10/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_atm/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_atm/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 #
 # Author: Harti Brandt <harti at freebsd.org>
 
-CONTRIB= ${.CURDIR}/../../../../contrib/ngatm
+CONTRIB= ${SRCTOP}/contrib/ngatm
 .PATH: ${CONTRIB}/snmp_atm
 
 MOD=	atm

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_hast/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_hast/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-.PATH:	${.CURDIR}/../../../../sbin/hastd
+.PATH:	${SRCTOP}/sbin/hastd
 
 MOD=	hast
 SRCS=	ebuf.c
@@ -18,7 +18,7 @@ MAN=	snmp_hast.3
 NO_WFORMAT=
 NO_WCAST_ALIGN=
 NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+=-I${.CURDIR}/../../../../sbin/hastd
+CFLAGS+=-I${SRCTOP}/sbin/hastd
 CFLAGS+=-DHAVE_CAPSICUM
 CFLAGS+=-DINET
 .if ${MK_INET6_SUPPORT} != "no"

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -28,7 +28,7 @@
 # $FreeBSD$
 #
 
-LPRSRC=	${.CURDIR}/../../../lpr/common_source
+LPRSRC=	${SRCTOP}/usr.sbin/lpr/common_source
 .PATH: ${LPRSRC}
 
 MOD=	hostres

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 #
 # Author: Harti Brandt <harti at freebsd.org>
 
-CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
+CONTRIB= ${SRCTOP}/contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_mibII
 
 MOD=	mibII

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_target/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_target/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_target/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 #
 # Author: Shteryana Shopova <syrinx at freebsd.org>
 
-CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
+CONTRIB= ${SRCTOP}/contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_target
 
 MOD=	target

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_usm/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_usm/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 #
 # Author: Shteryana Shopova <syrinx at freebsd.org>
 
-CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
+CONTRIB= ${SRCTOP}/contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_usm
 
 MOD=	usm

Modified: stable/10/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile	Fri Jan 13 09:04:29 2017	(r312054)
+++ stable/10/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile	Fri Jan 13 09:07:25 2017	(r312055)
@@ -2,7 +2,7 @@
 #
 # Author: Shteryana Shopova <syrinx at freebsd.org>
 
-CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
+CONTRIB= ${SRCTOP}/contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_vacm
 
 MOD=	vacm