summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-23 14:25:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-23 14:25:28 +0000
commit6dae73208d04ec4dc96398ad6550f40c5ad3ad71 (patch)
tree56f2f7a670e2718c695c13acb9748c007550b2b6
parent3c87de9447266cee23052d1e486da73429307b44 (diff)
downloadruby-6dae73208d04ec4dc96398ad6550f40c5ad3ad71.tar.gz
ruby-6dae73208d04ec4dc96398ad6550f40c5ad3ad71.tar.xz
ruby-6dae73208d04ec4dc96398ad6550f40c5ad3ad71.zip
* lib/mkmf.rb: $hdrdir should not contain macros for backward
compatibilitiy. [bruby-dev:28] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/mkmf.rb3
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6747af66d..ef8cccc8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Fri Apr 23 23:25:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb: $hdrdir should not contain macros for backward
+ compatibilitiy. [bruby-dev:28]
+
Fri Apr 23 16:38:46 2004 Tanaka Akira <akr@m17n.org>
- * lib/pathname.rb: sync taint/freeze flag between
+ * lib/pathname.rb: sync taint/freeze flag between
a pathname object and its internal string object.
Fri Apr 23 14:52:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e518a7efe..65ae853ba 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -79,8 +79,7 @@ end
libdir = File.dirname(__FILE__)
$extmk = libdir != Config::CONFIG["rubylibdir"]
if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h"
- $topdir = Config::CONFIG["archdir"]
- $hdrdir = $archdir
+ $hdrdir = $topdir = Config::CONFIG["archdir"]
elsif File.exist? $srcdir + "/ruby.h"
$topdir = Config::CONFIG["compile_dir"]
$hdrdir = $srcdir