summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2015-09-24 23:20:55 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-09-24 23:20:55 (GMT)
commit34436febd6259f78ceb573d5c7e8d7642523d811 (patch) (side-by-side diff)
treed8f37779dc0d1b4c8e44ea8daa6db896cbd3de60
parent146dbdb524bbf3f164c39e0f16184feb73aa1e7c (diff)
downloadvarnish-mib-34436febd6259f78ceb573d5c7e8d7642523d811.tar.gz
varnish-mib-34436febd6259f78ceb573d5c7e8d7642523d811.tar.bz2
Minor changes.
* configure.ac (MIBDIR): Change default value * src/Makefile.am (mib_DATA): Set to VARNISH-MIB.txt * src/VARNISH-MIB.txt
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/VARNISH-MIB.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 297f8a7..d571518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_ARG_WITH([dlmoddir],
*) AC_MSG_ERROR([argument to --with-dlmoddir must be absolute pathname])
esac])
-AC_SUBST([MIBDIR],['$(datarootdir)/snmp'])
+AC_SUBST([MIBDIR],['$(datarootdir)/snmp/mibs'])
AC_ARG_WITH([mibdir],
[AC_HELP_STRING([--with-mibdir=DIR],
[installation directory for MIB files])],
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c066f1..48c786b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@ AM_LDFLAGS = \
AM_CPPFLAGS=-I. ${VARNISHAPI_CFLAGS}
mibdir=@MIBDIR@
-mib_DATA = varnish_mib.mib2c
+mib_DATA = VARNISH-MIB.txt
dist_man_MANS = varnish-mib.8
diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index 71556c4..5686ee0 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -14,7 +14,7 @@ IMPORTS
FROM SNMPv2-SMI
DateAndTime
FROM SNMPv2-TC
- InetAddressIPv4, InetAddressIPv6, InetPortNumber,
+ InetAddressIPv4, InetAddressIPv6, InetPortNumber
FROM INET-ADDRESS-MIB
OBJECT-GROUP, MODULE-COMPLIANCE
FROM SNMPv2-CONF;

Return to:

Send suggestions and report system problems to the System administrator.