Permalink
Browse files

Use correct vendored zlib directory. Fixes #1159

This is fragile as it trades one hardcoded path for another.
This should be changed to using information placed in
Rubinius::BUILD_CONFIG by running ./configure.
  • Loading branch information...
1 parent 3a6fd65 commit 477ff6bfe2c2b6b3936f9782da84fd96418a9057 @jonforums jonforums committed Sep 22, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/zlib.rb.ffi
View
@@ -83,7 +83,7 @@ module Zlib
@@@
constants :required => true do |c|
- c.include_dir 'vm/external_libs/zlib'
+ c.include_dir 'vendor/zlib'
c.include 'zlib.h'
c.const 'ZLIB_VERSION', '%s', '(char *)', nil, to_s
@@ -122,7 +122,7 @@ module Zlib
@@@
constants do |c|
- c.include_dir 'vm/external_libs/zlib'
+ c.include_dir 'vendor/zlib'
c.include 'zconf.h'
c.const 'MAX_WBITS'
@@ -150,7 +150,7 @@ module Zlib
@@@
constants do |c|
- c.include_dir 'vm/external_libs/zlib'
+ c.include_dir 'vendor/zlib'
c.include 'zlib.h'
c.const 'OS_CODE'
@@ -243,7 +243,7 @@ module Zlib
def self.use_zstream_layout
@@@
struct do |s|
- s.include_dir 'vm/external_libs/zlib'
+ s.include_dir 'vendor/zlib'
s.include "zlib.h"
s.name "struct z_stream_s"

0 comments on commit 477ff6b

Please sign in to comment.