From 5e23ff603f53c99ac45e331e24498bfa124b4d72 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Mar 2004 09:48:09 +0000
Subject: * lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by  
 DESTDIR after installed.

* lib/mkmf.rb (dummy_makefile): default file lists to be cleaned.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  9 ++++++++-
 lib/mkmf.rb | 20 +++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 190f483228..cd2189ef56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 24 18:48:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
+	  DESTDIR after installed.
+
+	* lib/mkmf.rb (dummy_makefile): default file lists to be cleaned.
+
 Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
@@ -10,7 +17,7 @@ Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
 
 Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template): 
+	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
 	  Allow non-RDoc templates by putting a slash in the template name
 
 Wed Mar 24 10:05:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ba9f90c4f4..be6062829b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -45,7 +45,6 @@ $sitedir = CONFIG["sitedir"]
 $sitelibdir = CONFIG["sitelibdir"]
 $sitearchdir = CONFIG["sitearchdir"]
 
-$extmk = /extmk\.rb/ =~ $0
 $mswin = /mswin/ =~ RUBY_PLATFORM
 $bccwin = /bccwin/ =~ RUBY_PLATFORM
 $mingw = /mingw/ =~ RUBY_PLATFORM
@@ -79,9 +78,10 @@ def map_dir(dir, map = nil)
 end
 
 libdir = File.dirname(__FILE__)
-if libdir == Config::CONFIG["rubylibdir"] and
-    File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
-  $topdir = $hdrdir = $archdir
+$extmk = libdir != Config::CONFIG["rubylibdir"]
+if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
+  $topdir = Config::CONFIG["archdir"]
+  $hdrdir = $archdir
 elsif File.exist?(($top_srcdir ||= File.dirname(libdir))  + "/ruby.h") and
     File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
   $hdrdir = $top_srcdir
@@ -740,7 +740,7 @@ SHELL = /bin/sh
 
 srcdir = #{srcdir}
 topdir = #{$topdir}
-hdrdir = #{$hdrdir}
+hdrdir = #{$extmk ? $hdrdir : '$(topdir)'}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
   drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
@@ -799,7 +799,13 @@ INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
 end
 
 def dummy_makefile(srcdir)
-  configuration(srcdir) << "all install install-so install-rb: Makefile\n" << CLEANINGS
+  configuration(srcdir) << <<RULES << CLEANINGS
+CLEANFILES = #{$cleanfiles.join(' ')}
+DISTCLEANFILES = #{$distcleanfiles.join(' ')}
+
+all install install-so install-rb: Makefile
+
+RULES
 end
 
 def create_makefile(target, srcprefix = nil)
@@ -1052,7 +1058,7 @@ $configure_args["--topsrcdir"] ||= $srcdir
 Config::CONFIG["topdir"] = CONFIG["topdir"] =
   $curdir = arg_config("--curdir", Dir.pwd)
 $configure_args["--topdir"] ||= $curdir
-$ruby = arg_config("--ruby", File.join(CONFIG["bindir"], CONFIG["ruby_install_name"]))
+$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
 
 split = Shellwords.method(:shellwords).to_proc
 
-- 
cgit v1.2.3