From 0543f20b95f5db1cca209bd6f80f229721ed7e81 Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Sat, 24 Jan 2004 20:12:30 +0000 Subject: [PATCH] Rename the MIBS makefile variable to BMIBS so that it does not conflict with the environment variable MIBS that is used by net-snmp. --- lib/libbsnmp/modules/Makefile.inc | 6 +++--- lib/libbsnmp/modules/snmp_netgraph/Makefile | 2 +- usr.sbin/bsnmpd/modules/Makefile.inc | 6 +++--- usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libbsnmp/modules/Makefile.inc b/lib/libbsnmp/modules/Makefile.inc index ebeb521bcb3e..2aa608e65302 100644 --- a/lib/libbsnmp/modules/Makefile.inc +++ b/lib/libbsnmp/modules/Makefile.inc @@ -17,9 +17,9 @@ FILESGROUPS+= DEFS DEFSDIR= ${SHAREDIR}/bsnmp/defs .endif -.if defined(MIBS) -FILESGROUPS+= MIBS -MIBSDIR= ${SHAREDIR}/bsnmp/mibs +.if defined(BMIBS) +FILESGROUPS+= BMIBS +BMIBSDIR= ${SHAREDIR}/bsnmp/mibs .endif .include "../Makefile.inc" diff --git a/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile index 6c3cfb49ab53..d0323154be59 100644 --- a/lib/libbsnmp/modules/snmp_netgraph/Makefile +++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile @@ -9,7 +9,7 @@ SRCS= snmp_netgraph.c XSYM= begemotNg MAN= snmp_netgraph.3 -MIBS= BEGEMOT-NETGRAPH.txt +BMIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc index ebeb521bcb3e..2aa608e65302 100644 --- a/usr.sbin/bsnmpd/modules/Makefile.inc +++ b/usr.sbin/bsnmpd/modules/Makefile.inc @@ -17,9 +17,9 @@ FILESGROUPS+= DEFS DEFSDIR= ${SHAREDIR}/bsnmp/defs .endif -.if defined(MIBS) -FILESGROUPS+= MIBS -MIBSDIR= ${SHAREDIR}/bsnmp/mibs +.if defined(BMIBS) +FILESGROUPS+= BMIBS +BMIBSDIR= ${SHAREDIR}/bsnmp/mibs .endif .include "../Makefile.inc" diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile index 6c3cfb49ab53..d0323154be59 100644 --- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile @@ -9,7 +9,7 @@ SRCS= snmp_netgraph.c XSYM= begemotNg MAN= snmp_netgraph.3 -MIBS= BEGEMOT-NETGRAPH.txt +BMIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h