[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0c3aec8bf637aef645e3bcd378ec3773148228ab
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 01:50:04 2009 +0000

    Build fix to ensure the import library gets properly installed on Windows.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 4a64693..8a946aa 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-22  Kevin Ollivier  <kevino at theolliviers.com>
+
+        Build fix to ensure the import library gets properly installed on Windows.
+
+        * wscript:
+
 2009-09-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript
index b61e948..b5ba580 100644
--- a/WebKit/wx/wscript
+++ b/WebKit/wx/wscript
@@ -83,6 +83,8 @@ def pre_build(bld):
 def build(bld):
     bld.add_pre_fun(pre_build)
 
+    bld.env.LIBDIR = output_dir
+
     obj = bld.new_task_gen(
         features = 'cxx cshlib implib',
         includes = ' '.join(include_paths + js_include_dirs),

-- 
WebKit Debian packaging