projects / packages / ruby.git / blame
| Commit | Line | Data |
|---|---|---|
| c0484a8d ER |
1 | From 28e8a4ad0146fef37b514bde9a27ba5b6f7c34c5 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com> | |
| 3 | Date: Tue, 2 Jul 2013 11:51:50 +0200 | |
| 4 | Subject: [PATCH] Revert "mkmf.rb: prefix install_dirs only with DESTDIR" | |
| 5 | ||
| 6 | Fixes issues with DESTDIR. | |
| 7 | https://bugs.ruby-lang.org/issues/8115 | |
| 8 | ||
| 9 | This reverts commit 7e1d5045943835ff906850e7b3bc71f985ae5f36. | |
| 10 | --- | |
| 11 | lib/mkmf.rb | 29 ++++++++++++++--------------- | |
| 12 | 1 file changed, 14 insertions(+), 15 deletions(-) | |
| 13 | ||
| 14 | diff --git a/lib/mkmf.rb b/lib/mkmf.rb | |
| 15 | index ee89198..cca487e 100644 | |
| 16 | --- a/lib/mkmf.rb | |
| 17 | +++ b/lib/mkmf.rb | |
| 18 | @@ -189,21 +189,21 @@ module MakeMakefile | |
| 19 | ] | |
| 20 | elsif $configure_args.has_key?('--vendor') | |
| 21 | dirs = [ | |
| 22 | - ['BINDIR', '$(DESTDIR)$(bindir)'], | |
| 23 | - ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'], | |
| 24 | - ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'], | |
| 25 | - ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'], | |
| 26 | - ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], | |
| 27 | - ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], | |
| 28 | + ['BINDIR', '$(bindir)'], | |
| 29 | + ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], | |
| 30 | + ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], | |
| 31 | + ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], | |
| 32 | + ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], | |
| 33 | + ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], | |
| 34 | ] | |
| 35 | else | |
| 36 | dirs = [ | |
| 37 | - ['BINDIR', '$(DESTDIR)$(bindir)'], | |
| 38 | - ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'], | |
| 39 | - ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'], | |
| 40 | - ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'], | |
| 41 | - ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], | |
| 42 | - ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], | |
| 43 | + ['BINDIR', '$(bindir)'], | |
| 44 | + ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], | |
| 45 | + ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], | |
| 46 | + ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], | |
| 47 | + ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], | |
| 48 | + ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], | |
| 49 | ] | |
| 50 | end | |
| 51 | dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] | |
| 52 | @@ -1728,7 +1728,6 @@ SRC | |
| 53 | end | |
| 54 | ||
| 55 | def with_destdir(dir) | |
| 56 | - return dir unless $extmk | |
| 57 | dir = dir.sub($dest_prefix_pattern, '') | |
| 58 | /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir | |
| 59 | end | |
| 60 | @@ -1787,8 +1786,8 @@ ECHO = $(ECHO1:0=@echo) | |
| 61 | #### Start of system configuration section. #### | |
| 62 | #{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk} | |
| 63 | srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}} | |
| 64 | -topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace} | |
| 65 | -hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace} | |
| 66 | +topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace} | |
| 67 | +hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace} | |
| 68 | arch_hdrdir = #{$arch_hdrdir.quote} | |
| 69 | PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} | |
| 70 | VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} | |
| 71 | -- | |
| 72 | 1.8.2.1 | |
| 73 |