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


Index: lib/mkmf.rb
===================================================================
RCS file: /pub/cvs/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.182
diff -u -2 -p -d -r1.182 mkmf.rb
--- lib/mkmf.rb	23 Mar 2004 05:32:01 -0000	1.182
+++ lib/mkmf.rb	24 Mar 2004 05:20:04 -0000
@@ -46,5 +46,4 @@ $sitelibdir = CONFIG["sitelibdir"]
 $sitearchdir = CONFIG["sitearchdir"]
 
-$extmk = /extmk\.rb/ =~ $0
 $mswin = /mswin/ =~ RUBY_PLATFORM
 $bccwin = /bccwin/ =~ RUBY_PLATFORM
@@ -80,7 +79,8 @@ 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")
@@ -741,5 +741,5 @@ SHELL = /bin/sh
 srcdir = #{srcdir}
 topdir = #{$topdir}
-hdrdir = #{$hdrdir}
+hdrdir = #{$extmk ? $hdrdir : '$(topdir)'}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
@@ -800,5 +800,11 @@ 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
 
@@ -1015,5 +1021,5 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
   $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
-  $LIBPATH.unshift("$(topdir)") if $extmk or CROSS_COMPILING
+  $LIBPATH.unshift("$(topdir)") if $extmk
   $INSTALLFILES = nil
 
@@ -1053,5 +1059,5 @@ Config::CONFIG["topdir"] = CONFIG["topdi
   $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