diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-24 09:48:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-24 09:48:31 +0000 |
| commit | 5418176ea15932870006478c8b68bfaf95f9043a (patch) | |
| tree | f7c7ca1aed2610ec59d6477b05b6c85d012fe9ad | |
| parent | b7082fe88bd7a1c97bda7cc85de8615a55616b34 (diff) | |
| download | ruby-5418176ea15932870006478c8b68bfaf95f9043a.tar.gz ruby-5418176ea15932870006478c8b68bfaf95f9043a.tar.xz ruby-5418176ea15932870006478c8b68bfaf95f9043a.zip | |
* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
DESTDIR after installed.
* lib/mkmf.rb (RUBY): / is not recognized as path separator on
nmake/bmake. [ruby-list:39388]
* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | lib/mkmf.rb | 18 |
2 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,13 @@ +Wed Mar 24 18:48:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by + DESTDIR after installed. + + * lib/mkmf.rb (RUBY): / is not recognized as path separator on + nmake/bmake. [ruby-list:39388] + + * lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated. + 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,11 +20,11 @@ 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 Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org> - + * ruby.1: add -width option to .Bl for old groff. Sun Mar 21 21:11:16 2004 Keiju Ishitsuka <keiju@ishitsuka.com> diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a2dd73509..e518a7efe 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -46,7 +46,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 @@ -77,15 +76,17 @@ def map_dir(dir, map = nil) map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)} 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 elsif File.exist? $srcdir + "/ruby.h" + $topdir = Config::CONFIG["compile_dir"] $hdrdir = $srcdir else - warn "can't find header files for ruby." - exit 1 + abort "can't find header files for ruby." end -$topdir = $hdrdir OUTFLAG = CONFIG['OUTFLAG'] CPPOUTFILE = CONFIG['CPPOUTFILE'] @@ -714,7 +715,7 @@ SHELL = /bin/sh srcdir = #{srcdir} topdir = #{$topdir} -hdrdir = #{$hdrdir} +hdrdir = #{$extmk ? $hdrdir : '$(topdir)'} VPATH = #{$mingw && CONFIG['build_os'] == 'cygwin' ? '$(shell cygpath -u $(srcdir))' : '$(srcdir)'} } drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/ @@ -750,7 +751,8 @@ RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']} arch = #{CONFIG['arch']} sitearch = #{CONFIG['sitearch']} ruby_version = #{Config::CONFIG['ruby_version']} -RUBY = #{$ruby} +ruby = #{$ruby} +RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=\)' : '$(ruby)'} RM = $(RUBY) -run -e rm -- -f MAKEDIRS = $(RUBY) -run -e mkdir -- -p INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755 @@ -960,7 +962,7 @@ def init_mkmf(config = CONFIG) $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup $LDFLAGS = (with_config("ldflags") || "").dup - $INCFLAGS = "-I#{$topdir}" + $INCFLAGS = "-I$(topdir)" $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup $LIBEXT = config['LIBEXT'].dup $OBJEXT = config["OBJEXT"].dup @@ -1004,7 +1006,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 |