From 06c1a64ebb88474da466caae1ddfa0e72e9da284 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: [PATCH] * 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
---
 ChangeLog    | 8 ++++++++
 ext/extmk.rb | 1 +
 lib/mkmf.rb  | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0fbe53b0f..40669e0e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 dd3bcfeb2e..aa6200e370 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 841e79c0af..a9561cc7a5 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