fence-agents: master - build: drop mibdir as it's now unrequired

fence-agents: master - build: drop mibdir as it's now unrequired

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=9b6ae182eb5f1ee7a9e1ec4dc53c6468f6f6cf18
Commit:        9b6ae182eb5f1ee7a9e1ec4dc53c6468f6f6cf18
Parent:        525aa2eca9455abcd9fe02323fc8f42243f26fbf
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Mar 12 13:24:06 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Mar 12 13:27:41 2009 +0100

build: drop mibdir as it's now unrequired

fence_apc_snmp has been rewritten and there is no more need
to ship mib files.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure             |    7 -------
 make/defines.mk.input |    1 -
 make/fencebuild.mk    |    1 -
 make/install.mk       |    4 ----
 make/uninstall.mk     |    3 ---
 5 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index ad9437e..888d022 100755
--- a/configure
+++ b/configure
@@ -46,7 +46,6 @@ my %options = (
 	logdir => \$logdir,
 	syslogfacility => \$syslogfacility,
 	sysloglevel => \$sysloglevel,
-	mibdir => \$mibdir,
 	snmpbin => \$snmpbin,
 	confdir => \$confdir,
 	fence_agents => \$fence_agents,
@@ -90,7 +89,6 @@ my $err = &GetOptions (\%options,
 		    'logdir=s',
 		    'syslogfacility=s',
 		    'sysloglevel=s',
-		    'mibdir=s',
 		    'snmpbin=s',
 		    'confdir=s',
 		    'release_version=s',
@@ -120,7 +118,6 @@ if ($help || !$err) {
   print "--logdir=\tthe base directory for cluster logging files.  (Default: /var/log/cluster/)\n";
   print "--syslogfacility=\tset the default syslog facility.  (Default: LOG_LOCAL4)\n";
   print "--sysloglevel=\tset the default syslog level.  (Default: LOG_INFO)\n";
-  print "--mibdir=\tthe base directory for snmp mibs.  (Default: {prefix}/share/snmp/mibs)\n";
   print "--snmpbin=\tthe base directory for snmp binaries (Ex: /usr/bin/snmpwalk).  (Default: {prefix}/bin)\n";
   print "--confdir=\tthe cluster config directory.  (Default: /etc/cluster)\n";
   print "--mandir=\tthe base directory for man pages.  (Default: {prefix}/share/man)\n";
@@ -290,9 +287,6 @@ if (!$syslogfacility) {
 if (!$sysloglevel) {
   $sysloglevel="LOG_INFO";
 }
-if (!$mibdir) {
-  $mibdir="${prefix}/share/snmp/mibs";
-}
 if (!$snmpbin) {
   $snmpbin="${prefix}/bin";
 }
@@ -389,7 +383,6 @@ while (<IFILE>) {
   $_ =~ s/\@LOGDIR\@/$logdir/;
   $_ =~ s/\@SYSLOGFACILITY\@/$syslogfacility/;
   $_ =~ s/\@SYSLOGLEVEL\@/$sysloglevel/;
-  $_ =~ s/\@MIBDIR\@/$mibdir/;
   $_ =~ s/\@SNMPBIN\@/$snmpbin/;
   $_ =~ s/\@FENCE_AGENTS\@/$fence_agents/;
   $_ =~ s/\@FENCEAGENTSLIBDIR\@/$fenceagentslibdir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 76dc725..cb40363 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -6,7 +6,6 @@ docdir ?= ${DESTDIR}@DOCDIR@
 logdir ?= ${DESTDIR}@LOGDIR@
 mandir ?= ${DESTDIR}@MANDIR@
 incdir ?= ${DESTDIR}@INCDIR@
-mibdir ?= ${DESTDIR}@MIBDIR@
 snmpbin ?= @SNMPBIN@
 notifyddir ?= ${DESTDIR}@CONFDIR@/cman-notify.d
 
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 03fb62a..7c5f0c5 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -17,7 +17,6 @@ $(TARGET):
 		$(S) $@ | \
 	sed \
 		-e 's#@FENCEAGENTSLIBDIR@#${fenceagentslibdir}#g' \
-		-e 's#@MIBDIR@#${mibdir}#g' \
 		-e 's#@SNMPBIN@#${snmpbin}#g' \
 		-e 's#@LOGDIR@#${logdir}#g' \
 	> $@
diff --git a/make/install.mk b/make/install.mk
index db2ffa7..6e3cd68 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -17,10 +17,6 @@ ifdef INITDT
 		fi; \
 	done
 endif
-ifdef MIBRESOURCE
-	install -d ${mibdir}
-	install -m644 $(S)/${MIBRESOURCE} ${mibdir}
-endif
 ifdef FENCEAGENTSLIB
 	install -d ${DESTDIR}/${fenceagentslibdir}
 	install -m644 ${FENCEAGENTSLIB} ${DESTDIR}/${fenceagentslibdir}
diff --git a/make/uninstall.mk b/make/uninstall.mk
index 665194f..bc5c33c 100644
--- a/make/uninstall.mk
+++ b/make/uninstall.mk
@@ -8,9 +8,6 @@ endif
 ifdef INITDT
 	${UNINSTALL} ${INITDT} ${initddir}
 endif
-ifdef MIBRESOURCE
-	${UNINSTALL} ${MIBRESOURCE} ${mibdir}
-endif
 ifdef FENCEAGENTSLIB
 	${UNINSTALL} ${FENCEAGENTSLIB}* ${DESTDIR}/${fenceagentslibdir}
 endif