diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-10-09 15:48:09 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-10-09 15:48:09 -0700 |
| commit | 233e105b72c7057149262af23fa5a4725eb1c9f7 (patch) | |
| tree | 958085eb2833ae7c87a52f873bef4869f5101e5e | |
| parent | 89a52c0d42b3f173bbe2a052caee2ba4c597b629 (diff) | |
| parent | 075116c703befab425c917e443887156d04272c0 (diff) | |
| download | libyajl2-gem-233e105b72c7057149262af23fa5a4725eb1c9f7.tar.gz | |
Merge pull request #2 from opscode/lcg/windows-libname
revert munging the dll name
| -rw-r--r-- | ext/libyajl2/extconf.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb index 462a33b..1e94507 100644 --- a/ext/libyajl2/extconf.rb +++ b/ext/libyajl2/extconf.rb @@ -104,11 +104,6 @@ EOF system("make >make.out 2>&1") || raise # rubinius doesn't like the output this generates # ...so we can hack up what install does later and copy over the include files - # not sure why ruby windows produces .so's instead of .dll's - if windows? - FileUtils.mv "libyajl.so", "yajl.dll" - end - File.open("Makefile", "w+") do |f| f.write <<EOF TARGET = libyajl @@ -120,7 +115,7 @@ EOF f.write <<EOF install: \tmkdir -p #{prefix}/lib -\tcp yajl.dll #{prefix}/lib/yajl.dll +\tcp libyajl.so #{prefix}/lib/libyajl.so \tcp libyajldll.a #{prefix}/lib/libyajldll.a \tcp libyajl.def #{prefix}/lib/libyajl.def \tmkdir -p #{prefix}/include/yajl @@ -141,4 +136,3 @@ EOF end Libyajl2Build.makemakefiles - |