diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-09-25 02:20:55 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-09-25 02:20:55 +0300 |
commit | 34436febd6259f78ceb573d5c7e8d7642523d811 (patch) | |
tree | d8f37779dc0d1b4c8e44ea8daa6db896cbd3de60 | |
parent | 146dbdb524bbf3f164c39e0f16184feb73aa1e7c (diff) | |
download | varnish-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
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/VARNISH-MIB.txt | 2 |
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], | |||
67 | *) AC_MSG_ERROR([argument to --with-dlmoddir must be absolute pathname]) | 67 | *) AC_MSG_ERROR([argument to --with-dlmoddir must be absolute pathname]) |
68 | esac]) | 68 | esac]) |
69 | 69 | ||
70 | AC_SUBST([MIBDIR],['$(datarootdir)/snmp']) | 70 | AC_SUBST([MIBDIR],['$(datarootdir)/snmp/mibs']) |
71 | AC_ARG_WITH([mibdir], | 71 | AC_ARG_WITH([mibdir], |
72 | [AC_HELP_STRING([--with-mibdir=DIR], | 72 | [AC_HELP_STRING([--with-mibdir=DIR], |
73 | [installation directory for MIB files])], | 73 | [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 = \ | |||
55 | AM_CPPFLAGS=-I. ${VARNISHAPI_CFLAGS} | 55 | AM_CPPFLAGS=-I. ${VARNISHAPI_CFLAGS} |
56 | 56 | ||
57 | mibdir=@MIBDIR@ | 57 | mibdir=@MIBDIR@ |
58 | mib_DATA = varnish_mib.mib2c | 58 | mib_DATA = VARNISH-MIB.txt |
59 | 59 | ||
60 | dist_man_MANS = varnish-mib.8 | 60 | dist_man_MANS = varnish-mib.8 |
61 | 61 | ||
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 | |||
14 | FROM SNMPv2-SMI | 14 | FROM SNMPv2-SMI |
15 | DateAndTime | 15 | DateAndTime |
16 | FROM SNMPv2-TC | 16 | FROM SNMPv2-TC |
17 | InetAddressIPv4, InetAddressIPv6, InetPortNumber, | 17 | InetAddressIPv4, InetAddressIPv6, InetPortNumber |
18 | FROM INET-ADDRESS-MIB | 18 | FROM INET-ADDRESS-MIB |
19 | OBJECT-GROUP, MODULE-COMPLIANCE | 19 | OBJECT-GROUP, MODULE-COMPLIANCE |
20 | FROM SNMPv2-CONF; | 20 | FROM SNMPv2-CONF; |