瀏覽代碼

Fix distcheck

Richard Laager 15 年之前
父節點
當前提交
4f0ccc6c56
共有 2 個文件被更改,包括 9 次插入5 次删除
  1. 6 0
      configure.in
  2. 3 5
      mibs/Makefile.am

+ 6 - 0
configure.in

@@ -55,6 +55,12 @@ if test -n "$NETSNMP_CONFIG"; then
   then
      NETSNMP_LIBS="`$NETSNMP_CONFIG --libs`"
      NETSNMP_PREFIX="`$NETSNMP_CONFIG --prefix`"
+     # Hack to allow distcheck to succeed.
+     if echo "$NETSNMP_PREFIX" | grep -q "^$prefix"; then
+         NETSNMP_MIBPATH="$NETSNMP_PREFIX/share/snmp/mibs"
+     else
+         NETSNMP_MIBPATH="${prefix}${NETSNMP_PREFIX}/share/snmp/mibs"
+     fi
      NETSNMP_RPATH=
      for args in $NETSNMP_LIBS; do
           case $args in

+ 3 - 5
mibs/Makefile.am

@@ -1,5 +1,3 @@
-## Process this file with automake to generate Makefile.in
-mibsdir = $(NETSNMP_PREFIX)/share/snmp/mibs
-      mibs_DATA = CLAB-DEF-MIB.txt DOCS-BPI-MIB.mib DOCS-BPI2-MIB.mib DOCS-CABLE-DEVICE-MIB.mib DOCS-CABLE-DEVICE-TRAP-MIB.mib DOCS-IF-EXT-MIB.mib DOCS-IF-MIB.mib DOCS-QOS-MIB.mib DOCS-SUBMGT-MIB.mib IGMP-STD-MIB.mib PKTC-EVENT-MIB.mib PKTC-MTA-MIB.mib PKTC-SIG-MIB.mib
-EXTRA_DIST = CLAB-DEF-MIB.txt DOCS-BPI-MIB.mib DOCS-BPI2-MIB.mib DOCS-CABLE-DEVICE-MIB.mib DOCS-CABLE-DEVICE-TRAP-MIB.mib DOCS-IF-EXT-MIB.mib DOCS-IF-MIB.mib DOCS-QOS-MIB.mib DOCS-SUBMGT-MIB.mib IGMP-STD-MIB.mib PKTC-EVENT-MIB.mib PKTC-MTA-MIB.mib PKTC-SIG-MIB.mib
-
+mibsdir = $(NETSNMP_MIBPATH)
+mibs_DATA = CLAB-DEF-MIB.txt DOCS-BPI-MIB.mib DOCS-BPI2-MIB.mib DOCS-CABLE-DEVICE-MIB.mib DOCS-CABLE-DEVICE-TRAP-MIB.mib DOCS-IF-EXT-MIB.mib DOCS-IF-MIB.mib DOCS-QOS-MIB.mib DOCS-SUBMGT-MIB.mib IGMP-STD-MIB.mib PKTC-EVENT-MIB.mib PKTC-MTA-MIB.mib PKTC-SIG-MIB.mib
+EXTRA_DIST = $(mibs_DATA)