projects/aports·blob master · refs

131 lines · 3.6 KiB

1diff --git a/bin/Makefile.am b/bin/Makefile.am
2index 2c6f3bc..68be89e 100644
3--- a/bin/Makefile.am
4+++ b/bin/Makefile.am
5@@ -15,7 +15,8 @@
6 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
7
8
9-dist_bin_SCRIPTS = smokeinfo smokeping smokeping_cgi tSmoke
10+dist_bin_SCRIPTS = smokeinfo smokeping_cgi tSmoke
11+dist_sbin_SCRIPTS = smokeping
12
13 install-exec-hook:
14 test "$(PERL5LIB)" = "" || cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib (split /:/, q{$(PERL5LIB)}); # PERL5LIB}' $(dist_bin_SCRIPTS)
15diff --git a/bin/smokeinfo b/bin/smokeinfo
16index 2b38b86..ff96674 100755
17--- a/bin/smokeinfo
18+++ b/bin/smokeinfo
19@@ -2,8 +2,7 @@
20 use strict;
21 use warnings;
22
23-use lib (split /:/, q{}); # PERL5LIB
24-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
25+use lib qw(/usr/share/smokeping);
26
27 use Smokeping::Info;
28 use Getopt::Long 2.25 qw(:config no_ignore_case);
29diff --git a/bin/smokeping b/bin/smokeping
30index 1dae42a..550beb5 100755
31--- a/bin/smokeping
32+++ b/bin/smokeping
33@@ -4,13 +4,10 @@
34 use strict;
35 use warnings;
36
37-use FindBin;
38-use lib (split /:/, q{}); # PERL5LIB
39-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
40-
41+use lib qw(/usr/share/smokeping);
42 use Smokeping;
43
44-Smokeping::main("$FindBin::RealBin/../etc/config");
45+Smokeping::main("/etc/smokeping/config");
46
47 =head1 NAME
48
49diff --git a/bin/smokeping_cgi b/bin/smokeping_cgi
50index 610118c..9a995c1 100755
51--- a/bin/smokeping_cgi
52+++ b/bin/smokeping_cgi
53@@ -4,9 +4,7 @@
54 use strict;
55 use warnings;
56
57-use FindBin;
58-use lib (split /:/, q{}); # PERL5LIB
59-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
60+use lib qw(/usr/share/smokeping);
61
62 # don't bother with zombies
63 $SIG{CHLD} = 'IGNORE';
64@@ -17,7 +15,7 @@ use Smokeping;
65
66 use CGI::Fast;
67
68-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
69+my $cfg = (shift @ARGV) || "/etc/smokeping/config";
70
71
72 while (my $q = new CGI::Fast) {
73diff --git a/bin/tSmoke b/bin/tSmoke
74index 8559189..db9ef92 100755
75--- a/bin/tSmoke
76+++ b/bin/tSmoke
77@@ -52,10 +52,7 @@ use warnings;
78 #
79 # Point the lib variables to your implementation
80
81-use lib (split /:/, q{}); # PERL5LIB
82-use FindBin;
83-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
84-
85+use lib qw(/usr/share/smokeping);
86
87 use Smokeping;
88 use Net::SMTP;
89@@ -64,7 +61,7 @@ use Pod::Usage;
90 use RRDs;
91
92 # Point to your Smokeping config file
93-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
94+my $cfgfile = "etc/config.dist";
95
96 # global variables
97 my $cfg;
98diff --git a/doc/Makefile.am b/doc/Makefile.am
99index f9ad622..8c4c2e7 100644
100--- a/doc/Makefile.am
101+++ b/doc/Makefile.am
102@@ -119,6 +119,6 @@ iman7_DATA = $(MAN7)
103
104 EXAMPLES := $(wildcard examples/config.*)
105
106-etcdir = $(sysconfdir)/examples
107+etcdir = $(sysconfdir)/smokeping/examples
108 etc_DATA = $(EXAMPLES)
109
110diff --git a/etc/Makefile.am b/etc/Makefile.am
111index 70f7edd..d7bdb4d 100644
112--- a/etc/Makefile.am
113+++ b/etc/Makefile.am
114@@ -17,5 +17,5 @@
115
116 EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist
117
118-etcdir = $(sysconfdir)
119+etcdir = $(sysconfdir)/smokeping
120 etc_DATA = $(EXTRA_DIST)
121diff --git a/lib/Makefile.am b/lib/Makefile.am
122index 2209134..ab09330 100644
123--- a/lib/Makefile.am
124+++ b/lib/Makefile.am
125@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm)
126
127 EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
128
129-perllibdir = $(prefix)/lib
130+perllibdir = $(prefix)/share/smokeping
131 nobase_perllib_DATA = $(EXTRA_DIST)