diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-13 14:44:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-13 14:44:59 +0000 |
| commit | 96afcf2b075e3190405fac7f3f171dfe502f8afb (patch) | |
| tree | 6308106175e406ac0590895291265a79786606d7 /lib/mkmf.rb | |
| parent | 701243c468da4fc2fd3fd5fbe4e490e4f71f9c89 (diff) | |
* ext/extmk.rb: keep srcdir unexpanded.
* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
fixed: [ruby-core:04932]
* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
also INSTALL_PROG and INSTALL_DATA system dependent.
fixed: [ruby-core:04931]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6123877994..184b9b3269 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -846,8 +846,8 @@ SHELL = /bin/sh #### Start of system configuration section. #### srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}} -topdir = #{$extmk ? CONFIG["topdir"] : $topdir} -hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'} +topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote} +hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} } drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/ @@ -888,8 +888,8 @@ RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/= RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'} INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'} -INSTALL_PROG = $(INSTALL) -m 0755 -INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'} +INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'} COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'} #### End of system configuration section. #### |