Auch das Installationsbasisverzeichnis in @INC aufnehmen

Hintergrund ist konditionales Requiren von SL-Modulen, wenn vorher ein
chdir gemacht wurde (blöder alter Code, der chdirt...).

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 9083b8d..5b91223 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -3,8 +3,12 @@ package SL::Dispatcher;
 use strict;
 
 BEGIN {
-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  use SL::System::Process;
+  my $exe_dir = SL::System::Process::exe_dir;
+
+  unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift @INC, $exe_dir;
 }
 
 use CGI qw( -no_xhtml);