diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-08 11:18:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-08 11:18:17 +0000 |
| commit | 327f607dff56799d9dbb37c155188688e0331e92 (patch) | |
| tree | 9ac5d7eaf20f625f4e83300c3d3221c952b6e611 | |
| parent | 70819aa969c4a0d6046e08936a827325db643cb7 (diff) | |
| download | ruby-327f607dff56799d9dbb37c155188688e0331e92.tar.gz ruby-327f607dff56799d9dbb37c155188688e0331e92.tar.xz ruby-327f607dff56799d9dbb37c155188688e0331e92.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/extmk.rb | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -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> * ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size. diff --git a/ext/extmk.rb b/ext/extmk.rb index dd3bcfeb2..aa6200e37 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -115,6 +115,7 @@ def extmake(target) makefile = "./Makefile" ok = File.exist?(makefile) unless $ignore + Config::CONFIG["hdrdir"] = $hdrdir Config::CONFIG["srcdir"] = $srcdir Config::CONFIG["topdir"] = $topdir CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 841e79c0a..a9561cc7a 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -847,7 +847,7 @@ SHELL = /bin/sh #### Start of system configuration section. #### -srcdir = #{srcdir} +srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}} topdir = #{$extmk ? CONFIG["topdir"] : $topdir} hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} @@ -939,7 +939,7 @@ def create_makefile(target, srcprefix = nil) target_prefix = "" end - srcprefix ||= CONFIG['srcdir'] + srcprefix ||= '$(srcdir)' Config::expand(srcdir = srcprefix.dup) if not $objs |