[Pkg-javascript-commits] [node-expat] 161/371: Merge 'andreasbotsikas/windows-build'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository node-expat.

commit 11be45ea07b06a6d2a1c5cc9bafdc7985304738a
Merge: 3a6d5e8 9b7a994
Author: Astro <astro at spaceboyz.net>
Date:   Fri Jun 22 02:27:24 2012 +0200

    Merge 'andreasbotsikas/windows-build'
    
    Fixes Github pull request #23: Windows build

 lib/node-expat.js  |  7 ++---
 node-expat.cc      | 15 +++++-----
 tools/Readme.txt   | 13 +++++++++
 tools/module.gyp   | 75 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/node-gyp     | 33 +++++++++++++++++++++
 tools/node-gyp.bat | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 wscript            |  2 +-
 7 files changed, 217 insertions(+), 13 deletions(-)

diff --cc wscript
index eb23681,7f21af3..e38f342
--- a/wscript
+++ b/wscript
@@@ -18,9 -17,7 +18,9 @@@ def configure(conf)
  
  def build(bld):
    obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
-   obj.target = 'node-expat'
+   obj.target = 'node_expat'
    obj.source = 'node-expat.cc'
 +  obj.includes = [ '/usr/include', '/usr/local/include' ]
 +  obj.libpath = [ '/usr/lib', '/usr/lib64', '/usr/local/lib', '/usr/local/lib64' ]
    obj.lib = 'expat'
    obj.uselib = 'EXPAT'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-expat.git