Get rid of the winapi_check_dir config parameter.
diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm
index a992a72..d96449c 100644
--- a/tools/winapi/config.pm
+++ b/tools/winapi/config.pm
@@ -20,7 +20,7 @@
use strict;
-use setup qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
+use setup qw($current_dir $wine_dir $winapi_dir);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
require Exporter;
@@ -37,10 +37,10 @@
get_spec_files
);
@EXPORT_OK = qw(
- $current_dir $wine_dir $winapi_dir $winapi_check_dir
+ $current_dir $wine_dir $winapi_dir
);
-use vars qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
+use vars qw($current_dir $wine_dir $winapi_dir);
use output qw($output);
diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm
index b221ff7..b52972e 100644
--- a/tools/winapi/make_parser.pm
+++ b/tools/winapi/make_parser.pm
@@ -20,7 +20,7 @@
use strict;
-use setup qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
+use setup qw($current_dir $wine_dir $winapi_dir);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
require Exporter;
diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm
index c1e3b66..07fc824 100644
--- a/tools/winapi/modules.pm
+++ b/tools/winapi/modules.pm
@@ -34,7 +34,6 @@
file_directory
get_c_files get_spec_files
$current_dir $wine_dir
- $winapi_check_dir
);
use options qw($options);
use output qw($output);
diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm
index 4b8b80b..094ff05 100644
--- a/tools/winapi/nativeapi.pm
+++ b/tools/winapi/nativeapi.pm
@@ -29,7 +29,7 @@
use vars qw($nativeapi);
-use config qw(file_type $current_dir $wine_dir $winapi_check_dir);
+use config qw(file_type $current_dir $wine_dir $winapi_dir);
use options qw($options);
use output qw($output);
@@ -46,7 +46,7 @@
my $conditional_headers = \%{$self->{CONDITIONAL_HEADERS}};
my $conditional_functions = \%{$self->{CONDITIONAL_FUNCTIONS}};
- my $api_file = "$winapi_check_dir/nativeapi.dat";
+ my $api_file = "$winapi_dir/nativeapi.dat";
my $configure_ac_file = "$wine_dir/configure.ac";
my $config_h_in_file = "$wine_dir/include/config.h.in";
diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm
index 99e4517..5d0076e 100644
--- a/tools/winapi/setup.pm
+++ b/tools/winapi/setup.pm
@@ -26,15 +26,15 @@
@ISA = qw(Exporter);
@EXPORT = qw();
- @EXPORT_OK = qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
+ @EXPORT_OK = qw($current_dir $wine_dir $winapi_dir);
- use vars qw($current_dir $wine_dir $winapi_dir $winapi_check_dir);
+ use vars qw($current_dir $wine_dir $winapi_dir);
my $tool = $0;
$tool =~ s%^(?:.*?/)?([^/]+)$%$1%;
if(defined($current_dir) && defined($wine_dir) &&
- defined($winapi_dir) && defined($winapi_check_dir))
+ defined($winapi_dir))
{
# Nothing
} elsif($0 =~ m%^(.*?)/?tools/([^/]+)/[^/]+$%) {
@@ -77,10 +77,7 @@
$winapi_dir = "$wine_dir/tools/winapi";
$winapi_dir =~ s%^\./%%;
- $winapi_check_dir = "$wine_dir/tools/winapi";
- $winapi_check_dir =~ s%^\./%%;
-
- push @INC, ($winapi_dir, $winapi_check_dir);
+ push @INC, $winapi_dir;
} else {
print STDERR "$tool: You must run this tool in the main Wine directory or a sub directory\n";
exit 1;
diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract
index 4923556..70b3f5a 100755
--- a/tools/winapi/winapi_extract
+++ b/tools/winapi/winapi_extract
@@ -26,7 +26,7 @@
use config qw(
file_type files_skip files_filter get_spec_files
- $current_dir $wine_dir $winapi_dir $winapi_check_dir
+ $current_dir $wine_dir $winapi_dir
);
use output qw($output);
use winapi_extract_options qw($options);
diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup
index ca42dce..13d5599 100755
--- a/tools/winapi/winapi_fixup
+++ b/tools/winapi/winapi_fixup
@@ -29,7 +29,7 @@
file_skip files_skip
file_normalize
get_spec_files
- $current_dir $wine_dir $winapi_dir $winapi_check_dir
+ $current_dir $wine_dir $winapi_dir
);
use output qw($output);
use winapi_fixup_options qw($options);
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 8363a81..f158545 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -26,7 +26,7 @@
use config qw(
file_type files_skip files_filter
- $current_dir $wine_dir $winapi_dir $winapi_check_dir
+ $current_dir $wine_dir $winapi_dir
);
use output qw($output);
use winapi_test_options qw($options);
