aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl2
-rw-r--r--util/mkerr.pl21
-rw-r--r--util/pl/BC-32.pl2
-rw-r--r--util/pl/VC-32.pl2
4 files changed, 17 insertions, 10 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 550ef9f68534..1eee7aa349e2 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -326,7 +326,7 @@ open(IN,"<$infile") || die "unable to open $infile:$!\n";
$_=<IN>;
for (;;)
{
- chop;
+ s/\s*$//; # was chop, didn't work in mixture of perls for Windows...
($key,$val)=/^([^=]+)=(.*)/;
if ($key eq "RELATIVE_DIRECTORY")
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 8d2fdbc7e88b..d87c4fd22cd2 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -534,14 +534,21 @@ EOF
# First, read any existing reason string definitions:
my %err_reason_strings;
if (open(IN,"<$cfile")) {
+ my $line = "";
while (<IN>) {
- if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
- $err_reason_strings{$1} = $2;
- }
- if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
- if (!exists $ftrans{$1} && ($1 ne $2)) {
- print STDERR "WARNING: Mismatched function string $2\n";
- $ftrans{$1} = $2;
+ chomp;
+ $_ = $line . $_;
+ $line = "";
+ if (/{ERR_(FUNC|REASON)\(/) {
+ if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
+ $err_reason_strings{$1} = $2;
+ } elsif (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
+ if (!exists $ftrans{$1} && ($1 ne $2)) {
+ print STDERR "WARNING: Mismatched function string $2\n";
+ $ftrans{$1} = $2;
+ }
+ } else {
+ $line = $_;
}
}
}
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index b41bb45e8204..6d036644de74 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -130,7 +130,7 @@ sub do_link_rule
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
- $n=&bname($targer);
+ $n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
return($ret);
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 3705fc73b70c..b59799851527 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -341,7 +341,7 @@ sub do_link_rule
my($target,$files,$dep_libs,$libs,$standalone)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
- $n=&bname($targer);
+ $n=&bname($target);
$ret.="$target: $files $dep_libs\n";
if ($standalone == 1)
{