|
 |
5257f0 |
From 28e8a4ad0146fef37b514bde9a27ba5b6f7c34c5 Mon Sep 17 00:00:00 2001
|
|
|
5257f0 |
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
|
5257f0 |
Date: Tue, 2 Jul 2013 11:51:50 +0200
|
|
|
5257f0 |
Subject: [PATCH] Revert "mkmf.rb: prefix install_dirs only with DESTDIR"
|
|
|
5257f0 |
|
|
|
5257f0 |
This reverts commit 7e1d5045943835ff906850e7b3bc71f985ae5f36.
|
|
|
5257f0 |
---
|
|
|
5257f0 |
lib/mkmf.rb | 29 ++++++++++++++---------------
|
|
|
5257f0 |
1 file changed, 14 insertions(+), 15 deletions(-)
|
|
|
5257f0 |
|
|
|
5257f0 |
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
|
|
|
5257f0 |
index ee89198..cca487e 100644
|
|
|
5257f0 |
--- a/lib/mkmf.rb
|
|
|
5257f0 |
+++ b/lib/mkmf.rb
|
|
|
5257f0 |
@@ -189,21 +189,21 @@ module MakeMakefile
|
|
|
5257f0 |
]
|
|
|
5257f0 |
elsif $configure_args.has_key?('--vendor')
|
|
|
5257f0 |
dirs = [
|
|
|
5257f0 |
- ['BINDIR', '$(DESTDIR)$(bindir)'],
|
|
|
5257f0 |
- ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'],
|
|
|
5257f0 |
- ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'],
|
|
|
5257f0 |
- ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'],
|
|
|
5257f0 |
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
|
|
|
5257f0 |
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
|
|
|
5257f0 |
+ ['BINDIR', '$(bindir)'],
|
|
|
5257f0 |
+ ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
|
|
|
5257f0 |
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
|
|
|
5257f0 |
]
|
|
|
5257f0 |
else
|
|
|
5257f0 |
dirs = [
|
|
|
5257f0 |
- ['BINDIR', '$(DESTDIR)$(bindir)'],
|
|
|
5257f0 |
- ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'],
|
|
|
5257f0 |
- ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'],
|
|
|
5257f0 |
- ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'],
|
|
|
5257f0 |
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
|
|
|
5257f0 |
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
|
|
|
5257f0 |
+ ['BINDIR', '$(bindir)'],
|
|
|
5257f0 |
+ ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
|
|
|
5257f0 |
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
|
|
|
5257f0 |
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
|
|
|
5257f0 |
]
|
|
|
5257f0 |
end
|
|
|
5257f0 |
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
|
|
|
4acc54 |
@@ -1741,7 +1741,6 @@ SRC
|
|
|
5257f0 |
end
|
|
|
5257f0 |
|
|
|
5257f0 |
def with_destdir(dir)
|
|
|
5257f0 |
- return dir unless $extmk
|
|
|
5257f0 |
dir = dir.sub($dest_prefix_pattern, '')
|
|
|
5257f0 |
/\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
|
|
|
5257f0 |
end
|
|
|
4acc54 |
@@ -1800,8 +1799,8 @@ ECHO = $(ECHO1:0=@echo)
|
|
|
5257f0 |
#### Start of system configuration section. ####
|
|
|
5257f0 |
#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
|
|
|
5257f0 |
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}}
|
|
|
5257f0 |
-topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
|
|
|
5257f0 |
-hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
|
|
|
5257f0 |
+topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace}
|
|
|
5257f0 |
+hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace}
|
|
|
5257f0 |
arch_hdrdir = #{$arch_hdrdir.quote}
|
|
|
5257f0 |
PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
|
|
|
5257f0 |
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
|
|
|
5257f0 |
--
|
|
|
5257f0 |
1.8.2.1
|
|
|
5257f0 |
|