From a02c93b3999e649d1603774c8e03d1ec26cb47d9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 8 Apr 2005 11:18:17 +0000
Subject: * 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/branches/ruby_1_8@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/mkmf.rb')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1541d0cef8..54f3812798 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
-- 
cgit v1.2.3