From: Chow Loong Jin <hyperair@debian.org>
Date: Mon, 31 Oct 2016 00:44:44 +0800
Subject: Add /usr/lib/slic3r to lib search path

---
 slic3r.pl                        | 3 +--
 utils/amf-to-stl.pl              | 3 +--
 utils/config-bundle-to-config.pl | 3 +--
 utils/dump-stl.pl                | 3 +--
 utils/estimate-gcode-time.pl     | 3 +--
 utils/gcode_sectioncut.pl        | 3 +--
 utils/pdf-slices.pl              | 3 +--
 utils/send-gcode.pl              | 3 +--
 utils/split_stl.pl               | 3 +--
 utils/stl-to-amf.pl              | 3 +--
 utils/view-mesh.pl               | 3 +--
 utils/view-toolpaths.pl          | 3 +--
 utils/wireframe.pl               | 3 +--
 13 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/slic3r.pl b/slic3r.pl
index 11dc2fa..ad88289 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -5,8 +5,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/lib";
-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
+    use lib "$FindBin::Bin/lib", "/usr/lib/slic3r/";
 }
 
 use File::Basename qw(basename);
diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
index 56df2e2..c3bb567 100755
--- a/utils/amf-to-stl.pl
+++ b/utils/amf-to-stl.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use File::Basename qw(basename);
diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
index e1d7f61..1c5d6a6 100755
--- a/utils/config-bundle-to-config.pl
+++ b/utils/config-bundle-to-config.pl
@@ -8,8 +8,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
index 6da275a..82a1272 100644
--- a/utils/dump-stl.pl
+++ b/utils/dump-stl.pl
@@ -7,8 +7,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Slic3r;
diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
index 43c558b..350e4bf 100755
--- a/utils/estimate-gcode-time.pl
+++ b/utils/estimate-gcode-time.pl
@@ -5,8 +5,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Slic3r;
diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
index b94a2fc..dffeed1 100644
--- a/utils/gcode_sectioncut.pl
+++ b/utils/gcode_sectioncut.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
index 30c41ae..123073d 100755
--- a/utils/pdf-slices.pl
+++ b/utils/pdf-slices.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
index d87e682..21ce13d 100644
--- a/utils/send-gcode.pl
+++ b/utils/send-gcode.pl
@@ -5,8 +5,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Slic3r;
diff --git a/utils/split_stl.pl b/utils/split_stl.pl
index eb659b9..ae19245 100755
--- a/utils/split_stl.pl
+++ b/utils/split_stl.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use File::Basename qw(basename);
diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
index cb04189..c4db142 100755
--- a/utils/stl-to-amf.pl
+++ b/utils/stl-to-amf.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use File::Basename qw(basename);
diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
index 91cd20a..d8eac61 100644
--- a/utils/view-mesh.pl
+++ b/utils/view-mesh.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
index d4c47f0..bacc2ab 100755
--- a/utils/view-toolpaths.pl
+++ b/utils/view-toolpaths.pl
@@ -6,8 +6,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/wireframe.pl b/utils/wireframe.pl
index f49b66e..ada846e 100644
--- a/utils/wireframe.pl
+++ b/utils/wireframe.pl
@@ -7,8 +7,7 @@ use warnings;
 
 BEGIN {
     use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
+    use lib "$FindBin::Bin/../lib", "/usr/lib/slic3r/";
 }
 
 use Getopt::Long qw(:config no_auto_abbrev);