diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-08 17:37:25 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-08 17:37:25 +0000 |
| commit | fdae1084ba611f6ad489013df7242c829ebe62e3 (patch) | |
| tree | e688e62cfe356f107bd105e97450db05b2b7b95c /lib | |
| parent | f31a47fdae9cad888847852c847963f6e22f22ba (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 29 |
1 files changed, 15 insertions, 14 deletions
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'])} |