Get rid of the winapi_check_dir config parameter.

tools/winapi/config.pm

@@ -20,7 +20,7 @@ package config;
 
 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 @@ require Exporter;
     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);
 

tools/winapi/make_parser.pm

@@ -20,7 +20,7 @@ package make_parser;
 
 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;

tools/winapi/modules.pm

@@ -34,7 +34,6 @@ use config qw(
     file_directory
     get_c_files get_spec_files
     $current_dir $wine_dir
-    $winapi_check_dir
 );
 use options qw($options);
 use output qw($output);

tools/winapi/nativeapi.pm

@@ -29,7 +29,7 @@ require Exporter;
 
 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 @@ sub new($) {
     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";
 

tools/winapi/setup.pm

@@ -26,15 +26,15 @@ BEGIN {
 
     @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 @@ BEGIN {
 	$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;

tools/winapi/winapi_extract

@@ -26,7 +26,7 @@ BEGIN {
 
 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);

tools/winapi/winapi_fixup

@@ -29,7 +29,7 @@ use config qw(
     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);

tools/winapi/winapi_test

@@ -26,7 +26,7 @@ BEGIN {
 
 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);