diff options
| -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 18:26:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts. diff --git a/ext/extmk.rb b/ext/extmk.rb index edff049886..859538fe52 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 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 |