Merge branch 'packaging'

Conflicts:
	.gitignore

1 files changed, 6 insertions, 5 deletions

diff --git a/setenv.pl b/setenv.pl
index 2916a2c8a..b0cf94a78 100755
--- a/setenv.pl
+++ b/setenv.pl
@@ -3,8 +3,6 @@
 use strict;
 use warnings;
 
-use List::MoreUtils 'uniq';
-
 my $root;
 
 BEGIN {    # add the local perllibs too
@@ -17,11 +15,10 @@ BEGIN {    # add the local perllibs too
 # Set the environment for the FixMyStreet project
 
 # Add the lib/perl5 in perl-external so that we can load local::lib from there
-use lib "$root/perl-external/lib/perl5";
+use lib "$root/local/lib/perl5";
 
 # Add the perl-external dirs properly using local::lib
-use local::lib "$root/perl-external";
-use local::lib "$root/perl-external/local-lib";
+use local::lib "$root/local";
 
 use lib "$root/commonlib/perllib";
 use lib "$root/perllib";
@@ -29,6 +26,10 @@ for ( "$root/commonlib/perllib", "$root/perllib" ) {
     $ENV{PERL5LIB} = "$_:$ENV{PERL5LIB}";
 }
 
+# need to make sure we fetch this after our libs are in INC as some 
+# vendor provided versions are old an incompatible with Moose
+use List::MoreUtils 'uniq';
+
 # also set the path to our scripts etc
 $ENV{PATH} = join ':', uniq "$root/bin", split( m/:/, $ENV{PATH} );