Commit d663438a authored by Andrey Shevchuk's avatar Andrey Shevchuk

moved to new home

parent fbdd024c
...@@ -10,15 +10,12 @@ sub new { ...@@ -10,15 +10,12 @@ sub new {
my ($class) = ref($this) || $this; my ($class) = ref($this) || $this;
bless($self,$class); bless($self,$class);
my $home = $ENV{HOME} // "/root"; $self->{root} = '/opt/thirdlane/perl_lib';
$self->{build_root} //= $home . '/workspace/pbxmanager/server/perl_lib';
$self->{root} //= -e $self->{build_root} ? $self->{build_root} : '/usr/libexec/webmin/asterisk/perl_lib';
$self->{force_libs} //= ['/usr/libexec/webmin', '/usr/libexec/webmin/asterisk']; $self->{force_libs} //= ['/usr/libexec/webmin', '/usr/libexec/webmin/asterisk'];
$ENV{LD_LIBRARY_PATH} = $self->{root} . '/local/usr/lib' . ($ENV{LD_LIBRARY_PATH} ? (':' . $ENV{LD_LIBRARY_PATH}) : ''); $ENV{LD_LIBRARY_PATH} = $self->{root} . '/local/usr/lib' . ($ENV{LD_LIBRARY_PATH} ? (':' . $ENV{LD_LIBRARY_PATH}) : '');
$ENV{LD_RUN_PATH} = $self->{root} . 'perl_lib/local/usr/lib:' . ($ENV{LD_RUN_PATH} ? (':' . $ENV{LD_RUN_PATH}) : ''); $ENV{LD_RUN_PATH} = $self->{root} . '/local/usr/lib:' . ($ENV{LD_RUN_PATH} ? (':' . $ENV{LD_RUN_PATH}) : '');
$ENV{PKG_CONFIG_PATH} = $self->{root} . '/perl_lib/local/usr/lib/pkgconfig:' . ($ENV{PKG_CONFIG_PATH} ? (':' . $ENV{PKG_CONFIG_PATH}) : ''); $ENV{PKG_CONFIG_PATH} = $self->{root} . '/local/usr/lib/pkgconfig:' . ($ENV{PKG_CONFIG_PATH} ? (':' . $ENV{PKG_CONFIG_PATH}) : '');
$self->init_data(); $self->init_data();
$self->init_inc() unless $self->{no_change_inc}; $self->init_inc() unless $self->{no_change_inc};
...@@ -277,8 +274,8 @@ sub Thirdlane::Boot::Local::INC { ...@@ -277,8 +274,8 @@ sub Thirdlane::Boot::Local::INC {
my $module = join '', <$fh>; my $module = join '', <$fh>;
close $fh; close $fh;
if (-f '/usr/libexec/webmin/asterisk/perl_lib/lib/init_config.pl') { if (-f '/opt/thirdlane/perl_lib/lib/init_config.pl') {
open ($fh, '<', '/usr/libexec/webmin/asterisk/perl_lib/lib/init_config.pl'); open ($fh, '<', '/opt/thirdlane/perl_lib/lib/init_config.pl');
my $fixture = join '', <$fh>; my $fixture = join '', <$fh>;
close $fh; close $fh;
...@@ -287,8 +284,8 @@ sub Thirdlane::Boot::Local::INC { ...@@ -287,8 +284,8 @@ sub Thirdlane::Boot::Local::INC {
# $self->debug("Patched module: ", $module); # $self->debug("Patched module: ", $module);
} }
if (-f '/usr/libexec/webmin/asterisk/perl_lib/lib/open_readfile.pl') { if (-f '/opt/thirdlane/perl_lib/lib/open_readfile.pl') {
open ($fh, '<', '/usr/libexec/webmin/asterisk/perl_lib/lib/open_readfile.pl'); open ($fh, '<', '/opt/thirdlane/perl_lib/lib/open_readfile.pl');
my $fixture = join '', <$fh>; my $fixture = join '', <$fh>;
close $fh; close $fh;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment