summaryrefslogtreecommitdiff
path: root/bin/PerlACE/Process_Win32.pm
diff options
context:
space:
mode:
Diffstat (limited to 'bin/PerlACE/Process_Win32.pm')
-rw-r--r--bin/PerlACE/Process_Win32.pm20
1 files changed, 11 insertions, 9 deletions
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index e9d8c173025..d83f333e118 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -81,6 +81,11 @@ sub Normalize_Executable_Name
$executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE";
+ ## Installed executables do not conform to the ExeSubDir
+ if (! -x $executable && -x $dirname.$basename.'.EXE') {
+ $executable = $dirname.$basename.'.EXE';
+ }
+
$executable =~ s/\//\\/g; # / <- # color coding issue in devenv
return $executable;
@@ -97,16 +102,13 @@ sub Executable
my $executable = $self->{EXECUTABLE};
- if ($self->{IGNOREEXESUBDIR}) {
- return $executable;
+ if ($self->{IGNOREEXESUBDIR} == 0) {
+ $executable = PerlACE::Process::Normalize_Executable_Name ($executable);
+ }
+ else {
+ $executable = $executable.".EXE";
+ $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
}
-
- my $basename = basename ($executable);
- my $dirname = dirname ($executable). '/';
-
- $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE";
-
- $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
return $executable;
}