From 11ab1ee8ce83970f6c375fed025daf76e37e6cd1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 26 Jun 2004 02:07:30 +0000
Subject: * lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory
   names if necessary.  [ruby-talk:104505]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0561c8bdb..f132bf31b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -252,7 +252,7 @@ end
 def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
     (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
-  }.join
+  }.quote.join
 end
 
 def try_link0(src, opt="", &b)
@@ -541,10 +541,9 @@ def find_header(header, *paths)
     else
       found = false
       paths.each do |dir|
-        opt = "-I#{dir}"
+        opt = "-I#{dir}".quote
         if try_cpp(cpp_include(header), opt)
-          $INCFLAGS += " "
-          $INCFLAGS += opt
+          $INCFLAGS << " " << opt
           found = true
           break
         end
@@ -682,7 +681,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
     idirs.collect! {|dir| "-I" + dir}
     idirs -= Shellwords.shellwords($CPPFLAGS)
     unless idirs.empty?
-      $CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
+      $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
     end
   end
 
-- 
cgit