| 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 |
This reverts commit 7e1d5045943835ff906850e7b3bc71f985ae5f36. |
| 7 |
--- |
| 8 |
lib/mkmf.rb | 29 ++++++++++++++--------------- |
| 9 |
1 file changed, 14 insertions(+), 15 deletions(-) |
| 10 |
|
| 11 |
diff --git a/lib/mkmf.rb b/lib/mkmf.rb |
| 12 |
index ee89198..cca487e 100644 |
| 13 |
--- a/lib/mkmf.rb |
| 14 |
+++ b/lib/mkmf.rb |
| 15 |
@@ -189,21 +189,21 @@ module MakeMakefile |
| 16 |
] |
| 17 |
elsif $configure_args.has_key?('--vendor') |
| 18 |
dirs = [ |
| 19 |
- ['BINDIR', '$(DESTDIR)$(bindir)'], |
| 20 |
- ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'], |
| 21 |
- ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'], |
| 22 |
- ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'], |
| 23 |
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], |
| 24 |
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], |
| 25 |
+ ['BINDIR', '$(bindir)'], |
| 26 |
+ ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], |
| 27 |
+ ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], |
| 28 |
+ ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], |
| 29 |
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], |
| 30 |
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], |
| 31 |
] |
| 32 |
else |
| 33 |
dirs = [ |
| 34 |
- ['BINDIR', '$(DESTDIR)$(bindir)'], |
| 35 |
- ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'], |
| 36 |
- ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'], |
| 37 |
- ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'], |
| 38 |
- ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'], |
| 39 |
- ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], |
| 40 |
+ ['BINDIR', '$(bindir)'], |
| 41 |
+ ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], |
| 42 |
+ ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], |
| 43 |
+ ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], |
| 44 |
+ ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], |
| 45 |
+ ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], |
| 46 |
] |
| 47 |
end |
| 48 |
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] |
| 49 |
@@ -1728,7 +1728,6 @@ SRC |
| 50 |
end |
| 51 |
|
| 52 |
def with_destdir(dir) |
| 53 |
- return dir unless $extmk |
| 54 |
dir = dir.sub($dest_prefix_pattern, '') |
| 55 |
/\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir |
| 56 |
end |
| 57 |
@@ -1787,8 +1786,8 @@ ECHO = $(ECHO1:0=@echo) |
| 58 |
#### Start of system configuration section. #### |
| 59 |
#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk} |
| 60 |
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}} |
| 61 |
-topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace} |
| 62 |
-hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace} |
| 63 |
+topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace} |
| 64 |
+hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace} |
| 65 |
arch_hdrdir = #{$arch_hdrdir.quote} |
| 66 |
PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} |
| 67 |
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} |
| 68 |
-- |
| 69 |
1.8.2.1 |
| 70 |
|
Parent Directory
| 
Revision Log