From 1492028a96e3311a3a07cd9f79ebd9c5d3ade607 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 4 May 2005 10:43:00 +0000
Subject: [PATCH] Get rid of the winapi_check_dir config parameter.

---
 tools/winapi/config.pm      |  6 +++---
 tools/winapi/make_parser.pm |  2 +-
 tools/winapi/modules.pm     |  1 -
 tools/winapi/nativeapi.pm   |  4 ++--
 tools/winapi/setup.pm       | 11 ++++-------
 tools/winapi/winapi_extract |  2 +-
 tools/winapi/winapi_fixup   |  2 +-
 tools/winapi/winapi_test    |  2 +-
 8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm
index a992a72333f..d96449cdc0f 100644
--- a/tools/winapi/config.pm
+++ b/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);
 
diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm
index b221ff7b9be..b52972ed048 100644
--- a/tools/winapi/make_parser.pm
+++ b/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;
diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm
index c1e3b66294c..07fc8245de4 100644
--- a/tools/winapi/modules.pm
+++ b/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);
diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm
index 4b8b80b0d80..094ff05a1cf 100644
--- a/tools/winapi/nativeapi.pm
+++ b/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";
 
diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm
index 99e45175b4b..5d0076e11ac 100644
--- a/tools/winapi/setup.pm
+++ b/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;
diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract
index 4923556b830..70b3f5a7fb2 100755
--- a/tools/winapi/winapi_extract
+++ b/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);
diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup
index ca42dcea775..13d559960af 100755
--- a/tools/winapi/winapi_fixup
+++ b/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);
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 8363a811f08..f1585455132 100755
--- a/tools/winapi/winapi_test
+++ b/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);