Tony Wasserka : make_makefiles: Fix importlib handling.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9b7ca823d3038a21fd2d2983328aa770e166c3ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9b7ca823d3038a21fd2d298332...

Author: Tony Wasserka 
Date:   Tue Mar  4 15:08:57 2008 +0100

make_makefiles: Fix importlib handling.

---

tools/make_makefiles |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tools/make_makefiles b/tools/make_makefiles
index 98700db..aa10cb3 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -526,12 +526,9 @@ sub update_dlls(@)
     }
     foreach my $mod (sort keys %importlibs)
     {
-        my $dir = $directories{$mod};
-        my $def = $mod;
-        $def =~ s/.(dll|drv)$//;
-        $text .= sprintf " \\n\t%s/lib%s.$(IMPLIBEXT)", $dir, $def;
+        $text .= " \\n\t$directories{$mod}/$importlibs{$mod}.$(IMPLIBEXT)";
         next unless defined $static_implibs{$mod};
-        $text .= sprintf " \\n\t%s/lib%s.$(STATIC_IMPLIBEXT)", $dir, $def
+        $text .= " \\n\t$directories{$mod}/$importlibs{$mod}.$(STATIC_IMPLIBEXT)";
     }
     $text .= "\n\n";
     $text .= "implib: $(IMPORT_LIBS)\n\n";
@@ -588,10 +585,7 @@ sub update_dlls(@)
     }
     foreach my $mod (sort keys %importlibs)
     {
-        my $dir = $directories{$mod};
-        my $def = $mod;
-        $def =~ s/.(dll|drv)$//;
-        push @ignores, "dlls/$dir/lib$def.def";
+        push @ignores, "dlls/$directories{$mod}/$importlibs{$mod}.def";
     }

return @ignores;