| 1 | Use @@lib@@ instead of hardcoded lib, for lib64 systems. Patch should |
|---|
| 2 | be pushed upstream. |
|---|
| 3 | |
|---|
| 4 | diff -cr mrtg-2.16.4.lib64/bin/cfgmaker mrtg-2.16.4/bin/cfgmaker |
|---|
| 5 | *** mrtg-2.16.4.lib64/bin/cfgmaker Mon May 17 09:59:20 2010 |
|---|
| 6 | --- mrtg-2.16.4/bin/cfgmaker Sun Jul 11 14:58:42 2010 |
|---|
| 7 | *************** |
|---|
| 8 | *** 44,50 **** |
|---|
| 9 | |
|---|
| 10 | use FindBin; |
|---|
| 11 | use lib "${FindBin::Bin}"; |
|---|
| 12 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; |
|---|
| 13 | |
|---|
| 14 | use MRTG_lib "2.100015"; |
|---|
| 15 | use Getopt::Long; |
|---|
| 16 | --- 44,50 ---- |
|---|
| 17 | |
|---|
| 18 | use FindBin; |
|---|
| 19 | use lib "${FindBin::Bin}"; |
|---|
| 20 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; |
|---|
| 21 | |
|---|
| 22 | use MRTG_lib "2.100015"; |
|---|
| 23 | use Getopt::Long; |
|---|
| 24 | diff -cr mrtg-2.16.4.lib64/bin/indexmaker mrtg-2.16.4/bin/indexmaker |
|---|
| 25 | *** mrtg-2.16.4.lib64/bin/indexmaker Mon May 17 09:59:20 2010 |
|---|
| 26 | --- mrtg-2.16.4/bin/indexmaker Sun Jul 11 14:58:28 2010 |
|---|
| 27 | *************** |
|---|
| 28 | *** 48,54 **** |
|---|
| 29 | |
|---|
| 30 | use FindBin; |
|---|
| 31 | use lib "${FindBin::Bin}"; |
|---|
| 32 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; |
|---|
| 33 | |
|---|
| 34 | use MRTG_lib "2.100016"; |
|---|
| 35 | use Getopt::Long; |
|---|
| 36 | --- 48,54 ---- |
|---|
| 37 | |
|---|
| 38 | use FindBin; |
|---|
| 39 | use lib "${FindBin::Bin}"; |
|---|
| 40 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; |
|---|
| 41 | |
|---|
| 42 | use MRTG_lib "2.100016"; |
|---|
| 43 | use Getopt::Long; |
|---|
| 44 | diff -cr mrtg-2.16.4.lib64/bin/mrtg mrtg-2.16.4/bin/mrtg |
|---|
| 45 | *** mrtg-2.16.4.lib64/bin/mrtg Mon May 17 09:59:20 2010 |
|---|
| 46 | --- mrtg-2.16.4/bin/mrtg Sun Jul 11 14:58:54 2010 |
|---|
| 47 | *************** |
|---|
| 48 | *** 81,87 **** |
|---|
| 49 | |
|---|
| 50 | use FindBin; |
|---|
| 51 | use lib "${FindBin::Bin}"; |
|---|
| 52 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; |
|---|
| 53 | use Getopt::Long; |
|---|
| 54 | use Math::BigFloat; |
|---|
| 55 | |
|---|
| 56 | --- 81,87 ---- |
|---|
| 57 | |
|---|
| 58 | use FindBin; |
|---|
| 59 | use lib "${FindBin::Bin}"; |
|---|
| 60 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; |
|---|
| 61 | use Getopt::Long; |
|---|
| 62 | use Math::BigFloat; |
|---|
| 63 | |
|---|
| 64 | diff -cr mrtg-2.16.4.lib64/bin/mrtg-traffic-sum mrtg-2.16.4/bin/mrtg-traffic-sum |
|---|
| 65 | *** mrtg-2.16.4.lib64/bin/mrtg-traffic-sum Mon Dec 28 02:53:16 2009 |
|---|
| 66 | --- mrtg-2.16.4/bin/mrtg-traffic-sum Sun Jul 11 14:59:04 2010 |
|---|
| 67 | *************** |
|---|
| 68 | *** 33,39 **** |
|---|
| 69 | |
|---|
| 70 | use FindBin; |
|---|
| 71 | use lib "${FindBin::Bin}"; |
|---|
| 72 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; |
|---|
| 73 | use MRTG_lib "2.090017"; |
|---|
| 74 | use POSIX qw(mktime); |
|---|
| 75 | |
|---|
| 76 | --- 33,39 ---- |
|---|
| 77 | |
|---|
| 78 | use FindBin; |
|---|
| 79 | use lib "${FindBin::Bin}"; |
|---|
| 80 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; |
|---|
| 81 | use MRTG_lib "2.090017"; |
|---|
| 82 | use POSIX qw(mktime); |
|---|
| 83 | |
|---|
| 84 | diff -cr mrtg-2.16.4.lib64/contrib/cfgmaker_dlci/cfgmaker_dlci mrtg-2.16.4/contrib/cfgmaker_dlci/cfgmaker_dlci |
|---|
| 85 | *** mrtg-2.16.4.lib64/contrib/cfgmaker_dlci/cfgmaker_dlci Tue Feb 26 05:16:39 2002 |
|---|
| 86 | --- mrtg-2.16.4/contrib/cfgmaker_dlci/cfgmaker_dlci Sun Jul 11 14:59:12 2010 |
|---|
| 87 | *************** |
|---|
| 88 | *** 36,42 **** |
|---|
| 89 | |
|---|
| 90 | use FindBin; |
|---|
| 91 | use lib "${FindBin::Bin}"; |
|---|
| 92 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; |
|---|
| 93 | |
|---|
| 94 | use BER "0.57"; |
|---|
| 95 | use SNMP_Session "0.59"; |
|---|
| 96 | --- 36,42 ---- |
|---|
| 97 | |
|---|
| 98 | use FindBin; |
|---|
| 99 | use lib "${FindBin::Bin}"; |
|---|
| 100 | ! use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; |
|---|
| 101 | |
|---|
| 102 | use BER "0.57"; |
|---|
| 103 | use SNMP_Session "0.59"; |
|---|
