diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:10:33 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:10:33 +0000 |
| commit | 8d4aeb83454fa4ae5f48b06973867ec0b4771153 (patch) | |
| tree | 1e0e6d2098331ce0ed0720340fc787f19d0aeb43 | |
| parent | 6b7e6324b460b6f6bea32dc1d15fb3f994569122 (diff) | |
merge revision(s) 41756: [Backport #8115]
* 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/branches/ruby_2_0_0@49444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 25 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 14 deletions
@@ -1,3 +1,8 @@ +Fri Jan 30 16:00:35 2015 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] + Fri Jan 30 15:47:49 2015 Eric Wong <e@80x24.org> * numeric.c (bit_coerce): use original value for error message diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8b19eb6ba6..5f3df24ff0 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -189,21 +189,21 @@ module MakeMakefile ] 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}" : "")] @@ -1741,7 +1741,6 @@ SRC end def with_destdir(dir) - return dir unless $extmk dir = dir.sub($dest_prefix_pattern, '') /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-30" -#define RUBY_PATCHLEVEL 624 +#define RUBY_PATCHLEVEL 625 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 |