mkmf.rb: convert also arch_hdrdir [Bug ruby#16651]

nobu · nobu · commit 799ea1d1540a · 2021-04-11T21:59:45.000+09:00
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
@@ -1943,7 +1943,7 @@ def configuration(srcdir)
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}}
 topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
 hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
-arch_hdrdir = #{$arch_hdrdir.quote}
+arch_hdrdir = #{mkintpath($arch_hdrdir).unspace}
 PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }

Original file line number	Diff line number	Diff line change
`@@ -1943,7 +1943,7 @@ def configuration(srcdir)`
`1943`	`1943`	`srcdir = #{srcdir.gsub(/\$\((srcdir)\)\|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1\|\|$2]).unspace}}`
`1944`	`1944`	`topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}`
`1945`	`1945`	`hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}`
`1946`		`-arch_hdrdir = #{$arch_hdrdir.quote}`
	`1946`	`+arch_hdrdir = #{mkintpath($arch_hdrdir).unspace}`
`1947`	`1947`	`PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}`
`1948`	`1948`	`VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}`
`1949`	`1949`	`}`