mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* common.mk (pre-install-doc): create data directory before install.
* lib/mkmf.rb (dir_re): fixed typo. * lib/mkmf.rb (install_dirs): remove extra slash. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4e259f9094
commit
8978bfe7f9
3 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
|||
Wed Sep 20 23:17:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* common.mk (pre-install-doc): create data directory before install.
|
||||
|
||||
* lib/mkmf.rb (dir_re): fixed typo.
|
||||
|
||||
* lib/mkmf.rb (install_dirs): remove extra slash.
|
||||
|
||||
Wed Sep 20 22:41:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* numeric.c (fix_mul): typo again. patch from Tadashi Saito
|
||||
|
|
|
@ -236,6 +236,7 @@ rdoc: $(PROGRAM) PHONY
|
|||
$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
|
||||
|
||||
pre-install-doc:: PHONY
|
||||
$(RUNRUBY) -run -e mkdir -- -p "$(RIDATADIR)"
|
||||
|
||||
post-install-doc:: PHONY
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ def config_string(key, config = CONFIG)
|
|||
end
|
||||
|
||||
def dir_re(dir)
|
||||
Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$\(target_prefix\)|\{target_prefix\})?')
|
||||
Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
|
||||
end
|
||||
|
||||
INSTALL_DIRS = [
|
||||
|
@ -84,7 +84,7 @@ def install_dirs(target_prefix = nil)
|
|||
if $extout
|
||||
dirs = [
|
||||
['RUBYCOMMONDIR', '$(extout)/common'],
|
||||
['RUBYLIBDIR', '$(RUBYCOMMONDIR)/$(target_prefix)'],
|
||||
['RUBYLIBDIR', '$(RUBYCOMMONDIR)$(target_prefix)'],
|
||||
['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'],
|
||||
['extout', "#$extout"],
|
||||
['extout_prefix', "#$extout_prefix"],
|
||||
|
|
Loading…
Add table
Reference in a new issue