summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-19 19:14:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-19 19:14:22 +0000
commit971d5f8480853b036d40ab9befdb78253c35d195 (patch)
tree80862f1e4cd4897d04981ce287a916bff40e5b3a
parent9e1339a68f606f7c5ab50aac72c37f0d7dd69aa6 (diff)
* lib/mkmf.rb (egrep_cpp): use inspect to show options.
* lib/mkmf.rb (dir_config): prior configured directories to defaults. * lib/mkmf.rb (dir_config): extract first word to determin make command type. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--lib/mkmf.rb13
2 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c464667..a29b670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 20 04:14:17 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * lib/mkmf.rb (egrep_cpp): use inspect to show options.
+
+ * lib/mkmf.rb (dir_config): prior configured directories to
+ defaults.
+
+ * lib/mkmf.rb (dir_config): extract first word to determin
+ make command type.
+
Mon Jan 20 02:15:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ext/aix_mksym.rb: no longer used.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0be7b73..8479da5 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -279,7 +279,7 @@ def egrep_cpp(pat, src, opt="")
create_tmpsrc(src)
xpopen(cpp_command('', opt)) do |f|
if Regexp === pat
- puts(" ruby -ne 'print if /#{pat.source}/'")
+ puts(" ruby -ne 'print if #{pat.inspect}'")
f.grep(pat) {|l|
puts "#{f.lineno}: #{l}"
return true
@@ -513,11 +513,13 @@ def dir_config(target, idefault=nil, ldefault=nil)
if idir
idircflag = "-I" + idir
- $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
+ unless Shellwords.shellwords($CPPFLAGS).include?(idircflag)
+ $CPPFLAGS = idircflag + " " + $CPPFLAGS
+ end
end
if ldir
- $LIBPATH << ldir unless $LIBPATH.include?(ldir)
+ $LIBPATH.unshift(ldir) unless $LIBPATH.include?(ldir)
end
[idir, ldir]
@@ -814,12 +816,13 @@ init_mkmf
dir_config("opt")
$make = with_config("make-prog", ENV["MAKE"] || "make")
+make, = Shellwords.shellwords($make)
$nmake = nil
case
when $mswin
- $nmake = ?m if /nmake/i =~ $make
+ $nmake = ?m if /nmake/i =~ make
when $bccwin
- $nmake = ?b if /Borland/i =~ `#$make -h`
+ $nmake = ?b if /Borland/i =~ `#{make} -h`
end
Config::CONFIG["srcdir"] = CONFIG["srcdir"] =