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 | 7c899cde2bab2b76277005dcc2f4330f512f3883 (patch) | |
| tree | 9d0681366667321c06ee03fbf367bc65319debde /lib | |
| parent | 45559c50ae90784cb0d8baf077ee5c4f2be8b100 (diff) | |
| download | ruby-7c899cde2bab2b76277005dcc2f4330f512f3883.tar.gz ruby-7c899cde2bab2b76277005dcc2f4330f512f3883.tar.xz ruby-7c899cde2bab2b76277005dcc2f4330f512f3883.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/branches/ruby_1_8@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1541d0cef..54f381279 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 |