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

* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by

Browse source 
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
This commit is contained in:
nobu 2004-03-24 09:48:09 +00:00
parent d5158a0833
commit 5e23ff603f
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

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

20
lib/mkmf.rb
View file

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