rebuilt build system

5 files changed, 18 insertions, 20 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 633b9e3..3f4b21a 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -18,6 +18,8 @@
 dist_bin_SCRIPTS = smokeinfo smokeping smokeping_cgi tSmoke
 
 install-exec-hook:
-	[ x$PERL5LIB != x ] && cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib (split /:/, q{$(PERL5LIB)}); # PERL5LIB}' smokeinfo smokeping smokeping_cgi tSmoke
+	test "$(PERL5LIB)" = ""  || cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib (split /:/, q{$(PERL5LIB)}); # PERL5LIB}'  $(dist_bin_SCRIPTS)
+	cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(dist_bin_SCRIPTS)
+	cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};'  $(dist_bin_SCRIPTS)
 
 # EOF 
diff --git a/bin/smokeinfo b/bin/smokeinfo
index 571bd5a..7c56c0f 100755
--- a/bin/smokeinfo
+++ b/bin/smokeinfo
@@ -1,11 +1,9 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 use strict;
 use warnings;
 
-use FindBin;
-# PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib (split /:/, q{}); # PERL5LIB
+use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
 
 use Smokeping::Info;
 use Getopt::Long 2.25 qw(:config no_ignore_case);
diff --git a/bin/smokeping b/bin/smokeping
index f6b95b8..aaa38f0 100755
--- a/bin/smokeping
+++ b/bin/smokeping
@@ -1,17 +1,16 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # -*-perl-*-
 
 use strict;
 use warnings;
 
+use lib (split /:/, q{}); # PERL5LIB
 use FindBin;
-# PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
 
 use Smokeping;
  
-Smokeping::main("$FindBin::Bin/../etc/config");
+Smokeping::main("$FindBin::RealBin/../etc/config");
 
 =head1 NAME
 
diff --git a/bin/smokeping_cgi b/bin/smokeping_cgi
index 25efa5e..7e9ebd2 100755
--- a/bin/smokeping_cgi
+++ b/bin/smokeping_cgi
@@ -1,13 +1,12 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # -*-perl-*-   
 
 use strict;
 use warnings;
 
+use lib (split /:/, q{}); # PERL5LIB
 use FindBin;
-# PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
 
 # don't bother with zombies
 $SIG{CHLD} = 'IGNORE';
diff --git a/bin/tSmoke b/bin/tSmoke
index 6904f80..c5bf263 100755
--- a/bin/tSmoke
+++ b/bin/tSmoke
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #
 #-----------------------------------------------
 # tSmoke.pl
@@ -51,10 +51,10 @@ use warnings;
 # -- Getopt::Long
 #
 # Point the lib variables to your implementation
-use FindBin;
-# PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+
+use lib (split /:/, q{}); # PERL5LIB
+use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+
 
 use Smokeping;
 use Net::SMTP;