diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-01-02 20:46:29 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-01-02 20:46:29 +0000 |
| commit | 03fdbd5ccfb2b50c245bf1bf1b2b97e8c5f0619f (patch) | |
| tree | 855f7fbc78c6ffce7b668c39dbcc823fbb633746 /lang/ruby20 | |
| parent | 3b3558bf1fc88be65f6ef17d44579f74c1334de4 (diff) | |
Notes
Diffstat (limited to 'lang/ruby20')
| -rw-r--r-- | lang/ruby20/files/patch-mkmf.rb | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/lang/ruby20/files/patch-mkmf.rb b/lang/ruby20/files/patch-mkmf.rb new file mode 100644 index 000000000000..aa06632225c6 --- /dev/null +++ b/lang/ruby20/files/patch-mkmf.rb @@ -0,0 +1,44 @@ +--- lib/mkmf.rb.orig 2014-01-02 19:26:11.544779781 +0000 ++++ lib/mkmf.rb 2014-01-02 19:27:02.558776514 +0000 +@@ -189,21 +189,21 @@ + ] + elsif $configure_args.has_key?('--vendor') + dirs = [ +- ['BINDIR', '$(DESTDIR)$(bindir)'], +- ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'], +- ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'], +- ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'], +- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], +- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ++ ['BINDIR', '$(bindir)'], ++ ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], ++ ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], ++ ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], ++ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], ++ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], + ] + else + dirs = [ +- ['BINDIR', '$(DESTDIR)$(bindir)'], +- ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'], +- ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'], +- ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'], +- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], +- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ++ ['BINDIR', '$(bindir)'], ++ ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], ++ ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], ++ ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], ++ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], ++ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], + ] + end + dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] +@@ -1740,7 +1740,6 @@ + end + + def with_destdir(dir) +- return dir unless $extmk + dir = dir.sub($dest_prefix_pattern, '') + /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir + end |