← Back to branch summary

~ubuntu-branches/ubuntu/quantal/net-snmp/quantal-updates

« back to all changes in this revision

Viewing changes to debian/patches/03_makefiles.patch

  • Committer: Steve Langasek
  • Date: 2009-12-12 07:55:20 UTC
  • Revision ID: steve.langasek@canonical.com-20091212075520-tg1vj0mjvm326w58
revert additional changes related to MIB paths

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_makefiles.patch
15
15
===================================================================
16
16
--- net-snmp-5.4.2.1.orig/Makefile.top  2009-11-06 17:21:05.000000000 +0100
17
17
+++ net-snmp-5.4.2.1/Makefile.top       2009-11-06 17:25:41.000000000 +0100
18
 
@@ -24,8 +24,9 @@
19
 
 man5dir                = $(mandir)/man5
20
 
 man8dir                = $(mandir)/man8
 
18
@@ -26,6 +26,7 @@
21
19
 snmplibdir     = $(datadir)/snmp
22
 
-mibdir         = $(snmplibdir)/mibs
23
 
+mibdir         = $(datadir)/mibs/netsnmp
 
20
 mibdir         = $(snmplibdir)/mibs
24
21
 persistentdir  = @PERSISTENT_DIRECTORY@
25
22
+sysconfdir     = @sysconfdir@
26
23
 DESTDIR         = @INSTALL_PREFIX@
27
24
 INSTALL_PREFIX  = $(DESTDIR)
28
25
 
29
 
Index: net-snmp-5.4.2.1/mibs/Makefile.in
30
 
===================================================================
31
 
--- net-snmp-5.4.2.1.orig/mibs/Makefile.in      2009-11-06 17:21:05.000000000 +0100
32
 
+++ net-snmp-5.4.2.1/mibs/Makefile.in   2009-11-06 17:25:10.000000000 +0100
33
 
@@ -13,53 +13,33 @@
34
 
 OTHERUNINSTALL=mibsuninstall
35
 
 
36
 
 
37
 
-V1MIBS = RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
38
 
+NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
39
 
+       NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB
40
 
 
41
 
-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
42
 
-       SNMPv2-MIB.txt
43
 
+UCDMIBS = UCD-SNMP-MIB UCD-DEMO-MIB UCD-IPFWACC-MIB \
44
 
+       UCD-DLMOD-MIB UCD-DISKIO-MIB
45
 
 
46
 
-V3MIBS = SNMP-FRAMEWORK-MIB.txt SNMP-MPD-MIB.txt SNMP-TARGET-MIB.txt \
47
 
-       SNMP-NOTIFICATION-MIB.txt SNMP-PROXY-MIB.txt \
48
 
-       SNMP-USER-BASED-SM-MIB.txt SNMP-VIEW-BASED-ACM-MIB.txt \
49
 
-       SNMP-COMMUNITY-MIB.txt TRANSPORT-ADDRESS-MIB.txt
50
 
-
51
 
-AGENTMIBS = AGENTX-MIB.txt SMUX-MIB.txt
52
 
-
53
 
-IANAMIBS = IANAifType-MIB.txt IANA-LANGUAGE-MIB.txt \
54
 
-       IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
55
 
-
56
 
-RFCMIBS        = IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
57
 
-       EtherLike-MIB.txt \
58
 
-       IP-MIB.txt IP-FORWARD-MIB.txt IANA-RTPROTO-MIB.txt \
59
 
-       TCP-MIB.txt UDP-MIB.txt \
60
 
-       INET-ADDRESS-MIB.txt HCNUM-TC.txt \
61
 
-       HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt \
62
 
-       RMON-MIB.txt \
63
 
-       IPV6-TC.txt IPV6-MIB.txt IPV6-ICMP-MIB.txt IPV6-TCP-MIB.txt \
64
 
-       IPV6-UDP-MIB.txt \
65
 
-       DISMAN-EVENT-MIB.txt DISMAN-SCRIPT-MIB.txt DISMAN-SCHEDULE-MIB.txt \
66
 
-       NOTIFICATION-LOG-MIB.txt SNMP-USM-AES-MIB.txt \
67
 
-       SNMP-USM-DH-OBJECTS-MIB.txt \
68
 
-       SCTP-MIB.txt
69
 
-
70
 
-NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
71
 
-       NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
72
 
-
73
 
-UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
74
 
-       UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
75
 
-
76
 
-DEFAULTMIBS = @default_mibs_install@
77
 
-
78
 
-MIBS   = $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
79
 
-       $(AGENTMIBS) $(IANAMIBS) \
80
 
-       $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
81
 
+EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
82
 
+
83
 
+MIBS   = $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
84
 
+
85
 
+HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
86
 
+BINHELPERS = mibfetch smistrip
87
 
 
88
 
 all: standardall
89
 
 
90
 
 mibsinstall: installdirs
91
 
-       @for i in $(MIBS) ; do \
92
 
-               $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
93
 
-               echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
94
 
+       @for i in $(MIBS); do \
95
 
+               $(INSTALL_DATA) $(srcdir)/$$i.txt $(INSTALL_PREFIX)$(mibdir)/$$i ; \
96
 
+               echo "install: installed $$i.txt in $(INSTALL_PREFIX)$(mibdir)/$$i" ; \
97
 
+       done
98
 
+       @for i in $(HELPERS); do \
99
 
+               $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
100
 
+               echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
101
 
+       done
102
 
+       @for i in $(BINHELPERS) ; do \
103
 
+               $(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
104
 
+               echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
105
 
        done
106
 
 
107
 
 mibsuninstall: installdirs
108
 
@@ -67,6 +47,10 @@
109
 
                rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
110
 
                echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
111
 
        done
112
 
+       @for i in $(HELPERS) $(BINHELPERS) ; do \
113
 
+               rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
114
 
+               echo "removed $$i from $(INSTALL_PREFIX)$(datadir)/mibs" ; \
115
 
+       done
116
 
 
117
 
 installdirs:
118
 
        @$(SHELL) $(srcdir)/../mkinstalldirs $(INSTALL_PREFIX)$(mibdir)
119
26
Index: net-snmp-5.4.2.1/Makefile.in
120
27
===================================================================
121
28
--- net-snmp-5.4.2.1.orig/Makefile.in   2009-11-06 17:21:05.000000000 +0100