Merge pull request #115 from yahoo/arnej/use-lib64-site-perl

search .../lib64/perl5/site_perl for modules

7 files changed, 7 insertions, 2 deletions

diff --git a/configgen/bin/make-config.pl b/configgen/bin/make-config.pl
index 310688352a2..1837137ff07 100755
--- a/configgen/bin/make-config.pl
+++ b/configgen/bin/make-config.pl
@@ -71,6 +71,7 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/configgen/bin/make-configold.pl b/configgen/bin/make-configold.pl
index d974df7b867..a4a4ad843d1 100755
--- a/configgen/bin/make-configold.pl
+++ b/configgen/bin/make-configold.pl
@@ -71,6 +71,7 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl b/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
index 5a93948fdcd..10ee47cfa50 100755
--- a/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
+++ b/jdisc_akamai/src/main/perl/jdisc_akamai_conf.pl
@@ -63,6 +63,7 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/jdisc_status/src/main/perl/jdisc_status_conf.pl b/jdisc_status/src/main/perl/jdisc_status_conf.pl
index 5fb35f92258..bd635e1cf07 100755
--- a/jdisc_status/src/main/perl/jdisc_status_conf.pl
+++ b/jdisc_status/src/main/perl/jdisc_status_conf.pl
@@ -63,6 +63,7 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index 23c2d350d4c..45af63c564c 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -63,12 +63,12 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
 use strict;
 use warnings;
-use lib '$VESPA_HOME/lib/perl5/site_perl';
 
 use Yahoo::Vespa::Bin::GetClusterState;
 
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index ca394305e5f..c3865e92732 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -63,12 +63,12 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();
 
 use strict;
 use warnings;
-use lib '$VESPA_HOME/lib/perl5/site_perl';
 
 use Yahoo::Vespa::Bin::GetNodeState;
 
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 3933cb409e6..6dc099f8e5f 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -63,6 +63,7 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'};
 # END perl environment bootstrap section
 
 use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl';
+use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl';
 use Yahoo::Vespa::Defaults;
 readConfFile();