* ext/extmk.rb (extmake): hdrdir needs to be defined also in
Config::CONFIG. * lib/mkmf.rb (configuration, create_makefile): get rid of recursive macro reference. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
514abcc101
commit
06c1a64ebb
@ -1,3 +1,11 @@
|
|||||||
|
Fri Apr 8 20:17:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/extmk.rb (extmake): hdrdir needs to be defined also in
|
||||||
|
Config::CONFIG.
|
||||||
|
|
||||||
|
* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
|
||||||
|
macro reference.
|
||||||
|
|
||||||
Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||||
|
|
||||||
* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
|
* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
|
||||||
|
@ -115,6 +115,7 @@ def extmake(target)
|
|||||||
makefile = "./Makefile"
|
makefile = "./Makefile"
|
||||||
ok = File.exist?(makefile)
|
ok = File.exist?(makefile)
|
||||||
unless $ignore
|
unless $ignore
|
||||||
|
Config::CONFIG["hdrdir"] = $hdrdir
|
||||||
Config::CONFIG["srcdir"] = $srcdir
|
Config::CONFIG["srcdir"] = $srcdir
|
||||||
Config::CONFIG["topdir"] = $topdir
|
Config::CONFIG["topdir"] = $topdir
|
||||||
CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1]
|
CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1]
|
||||||
|
@ -847,7 +847,7 @@ SHELL = /bin/sh
|
|||||||
|
|
||||||
#### Start of system configuration section. ####
|
#### Start of system configuration section. ####
|
||||||
|
|
||||||
srcdir = #{srcdir}
|
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}}
|
||||||
topdir = #{$extmk ? CONFIG["topdir"] : $topdir}
|
topdir = #{$extmk ? CONFIG["topdir"] : $topdir}
|
||||||
hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'}
|
hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'}
|
||||||
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
|
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
|
||||||
@ -939,7 +939,7 @@ def create_makefile(target, srcprefix = nil)
|
|||||||
target_prefix = ""
|
target_prefix = ""
|
||||||
end
|
end
|
||||||
|
|
||||||
srcprefix ||= CONFIG['srcdir']
|
srcprefix ||= '$(srcdir)'
|
||||||
Config::expand(srcdir = srcprefix.dup)
|
Config::expand(srcdir = srcprefix.dup)
|
||||||
|
|
||||||
if not $objs
|
if not $objs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user