From fdae1084ba611f6ad489013df7242c829ebe62e3 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 8 Jun 2013 17:37:25 +0000 Subject: merge revision(s) 39841: [Backport #8115] * lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR directories to install only unless bundled extension libraries. [ruby-core:53502] [Bug #8115] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 29 +++++++++++++++-------------- version.h | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce404fde14..c9ee248e37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 9 02:27:07 2013 Nobuyoshi Nakada + + * lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR + directories to install only unless bundled extension libraries. + [ruby-core:53502] [Bug #8115] + Sun Jun 9 02:17:16 2013 Charlie Somerville * class.c (include_modules_at): invalidate method cache if included diff --git a/lib/mkmf.rb b/lib/mkmf.rb index cca487e438..ee89198143 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -189,21 +189,21 @@ module MakeMakefile ] elsif $configure_args.has_key?('--vendor') dirs = [ - ['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)'], + ['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)'], ] else dirs = [ - ['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)'], + ['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)'], ] end dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] @@ -1728,6 +1728,7 @@ SRC end def with_destdir(dir) + return dir unless $extmk dir = dir.sub($dest_prefix_pattern, '') /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir end @@ -1786,8 +1787,8 @@ ECHO = $(ECHO1:0=@echo) #### Start of system configuration section. #### #{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}} -topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace} -hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace} +topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace} +hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace} arch_hdrdir = #{$arch_hdrdir.quote} PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} diff --git a/version.h b/version.h index af8cd66101..35742fd006 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-09" -#define RUBY_PATCHLEVEL 213 +#define RUBY_PATCHLEVEL 214 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.3