kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/extmk.rb (extmake): hdrdir needs to be defined also in

Browse source 
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
This commit is contained in:
nobu 2005-04-08 11:18:17 +00:00
parent 0c25a62834
commit a02c93b399
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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.

1
ext/extmk.rb
View file

@ -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]

4
lib/mkmf.rb
View file

@ -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