diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-24 07:13:56 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-24 07:13:56 +0000 |
| commit | 0bc41b94a32e9e9581524f0008a23e6460dce17a (patch) | |
| tree | 9773b8b6f831e17298e6dc0a2155cdcc408f1ea7 | |
| parent | 2882d3ebae59b2fc8ff082e463f3fd79d53b8177 (diff) | |
| download | ruby-0bc41b94a32e9e9581524f0008a23e6460dce17a.tar.gz ruby-0bc41b94a32e9e9581524f0008a23e6460dce17a.tar.xz ruby-0bc41b94a32e9e9581524f0008a23e6460dce17a.zip | |
* mkconfig.rb: autoconf 2.50 support.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | mkconfig.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu May 24 16:08:21 2001 WATANABE Hirofumi <eban@ruby-lang.org> + + * mkconfig.rb: autoconf 2.50 support. + Thu May 24 14:23:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_yield_0): need argument adjustment for C defined diff --git a/mkconfig.rb b/mkconfig.rb index 721cd3f67..14e5829f5 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -48,7 +48,7 @@ File.foreach "config.status" do |line| v_others << v end has_version = true if name == "MAJOR" - elsif /^ac_given_srcdir=(.*)/ =~ line + elsif /^(?:ac_given_)srcdir=(.*)/ =~ line v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path($1) + "\"\n" has_srcdir = true elsif /^ac_given_INSTALL=(.*)/ =~ line @@ -58,7 +58,7 @@ File.foreach "config.status" do |line| end if not has_srcdir - v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path(srcdir) + "\"\n" + v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path(srcdir || '.') + "\"\n" end if not has_version |