diff --git a/config/make-jars.pl b/config/make-jars.pl index 417eebb0d907..7ef0f50a5640 100644 --- a/config/make-jars.pl +++ b/config/make-jars.pl @@ -2,6 +2,10 @@ # make-jars [-f] [-v] [-l] [-d ] [-s ] < +# we'll be pulling in some stuff from the script directory +use FindBin; +push @INC, $FindBin::Bin; + use strict; use Getopt::Std; @@ -12,7 +16,8 @@ use Cwd; use File::Copy; use File::Path; use IO::File; -use mozLock; +require mozLock; +import mozLock; my $objdir = getcwd; @@ -154,7 +159,7 @@ sub RegIt { my ($chromeDir, $jarFileName, $chromeType, $pkgName) = @_;\ chop($pkgName) if ($pkgName =~ m/\/$/); - #print "RegIt: $jarFileName, $chromeType, $pkgName\n"; + #print "RegIt: $chromeDir, $jarFileName, $chromeType, $pkgName\n"; my $line; if ($fileformat eq "flat") { diff --git a/config/mozLock.pm b/config/mozLock.pm index ebc60b4c9fb6..38afee4b52c1 100644 --- a/config/mozLock.pm +++ b/config/mozLock.pm @@ -52,7 +52,7 @@ sub priv_abspath($) { $file =~ s/\\/\//g; # Check if file is already absolute - if ($file =~ m/^\// || substr($file, 1, 0) eq ':') { + if ($file =~ m/^\// || substr($file, 1, 1) eq ':') { return $file; } $out = cwd . "/$file"; diff --git a/embedding/config/gen_mn.pl b/embedding/config/gen_mn.pl index 550e79c6eaa7..3c1eac93c866 100644 --- a/embedding/config/gen_mn.pl +++ b/embedding/config/gen_mn.pl @@ -3,8 +3,13 @@ ################################################################# # Rest of program +# get requirements from the same dir as the script +use FindBin; +push @INC, $FindBin::Bin; + +require GenerateManifest; +import GenerateManifest; use Getopt::Long; -use GenerateManifest; # Configuration $win32 = ($^O eq "MSWin32") ? 1 : 0; # ActiveState Perl