add defaults to daemon search path...recalc t/snmptest.cmd everytime per makefile.PL is run
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@4258 06827809-a52a-0410-b366-d66718629ded
diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL
index 2bec995..e6f3f72 100644
--- a/perl/SNMP/Makefile.PL
+++ b/perl/SNMP/Makefile.PL
@@ -87,7 +87,7 @@
sub GetTestInfo {
my $sep = ($^O =~ /win32/i ? '\\' : '/');
my $info_file = "t${sep}snmptest.cmd";
- my $snmpd_path1 = "${sep}usr${sep}local${sep}sbin";
+ my $snmpd_path1 = "${sep}usr${sep}local${sep}ssbin";
my $snmpd_path2 = "${sep}usr${sep}sbin";
my $snmpd_path3 = "${sep}usr${sep}bin";
open(H, ">$info_file") || die "Error: could not open file '$info_file'($!)";
@@ -126,12 +126,12 @@
$snmpd =~ s/($sep)?(snmpd)?$/${sep}snmpd/;
$snmptrapd =~ s/($sep)?(snmptrapd)?$/${sep}snmptrapd/;
+ print H "SNMPD => $snmpd\n";
+ print H "SNMPTRAPD => $snmptrapd\n";
if (-e $snmpd and -r $snmpd) {
if (not -x $snmpd) {
warn("Error: $snmpd not executable. 'make test' will not work.\n");
- } else {
- print H "SNMPD => $snmpd\n";
}
} else {
warn("Error: $snmpd does not exist or is unreadable. 'make test' will not work.\n");
@@ -140,8 +140,6 @@
if (-e $snmptrapd and -r $snmptrapd) {
if (not -x $snmptrapd) {
warn("Error: $snmptrapd not executable. 'make test' will not work.\n");
- } else {
- print H "SNMPTRAPD => $snmptrapd\n";
}
} else {
warn("Error: $snmptrapd does not exist or is unreadable. 'make test' will not work.\n");
