1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mkmf.rb: revert DESTDIR prefix

Browse Source 
* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
  it is fixed by r41648.  [ruby-core:55760] [Bug #8115]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-07-03 09:12:59 +00:00
parent 48b19a3a75
commit 48ebea719f
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 3 18:12:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
it is fixed by r41648. [ruby-core:55760] [Bug #8115]
Wed Jul 3 14:15:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jul 3 14:15:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (do_stat): use rb_w32_ustati64() in win32.c to get rid of * dir.c (do_stat): use rb_w32_ustati64() in win32.c to get rid of

25
lib/mkmf.rb
View File

@ -199,21 +199,21 @@ module MakeMakefile
] ]
elsif $configure_args.has_key?('--vendor') elsif $configure_args.has_key?('--vendor')
dirs = [ dirs = [
['BINDIR', '$(DESTDIR)$(bindir)'], ['BINDIR', '$(bindir)'],
['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'], ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'], ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'],
['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
else else
dirs = [ dirs = [
['BINDIR', '$(DESTDIR)$(bindir)'], ['BINDIR', '$(bindir)'],
['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'], ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'], ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
end end
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@ -1770,7 +1770,6 @@ SRC
# :stopdoc: # :stopdoc:
def with_destdir(dir) def with_destdir(dir)
return dir unless $extmk
dir = dir.sub($dest_prefix_pattern, '') dir = dir.sub($dest_prefix_pattern, '')
/\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
end end