diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-20 14:18:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-20 14:18:19 +0000 |
| commit | b560eab5846fa8a390f56b240e63bc754eeb0b3f (patch) | |
| tree | 21f3f6e767e7ee853027f0ad891015e2dff80ddd | |
| parent | 22c07519c05c07ef8a38edaceca163a578b89211 (diff) | |
* 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/branches/ruby_1_8@10973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
3 files changed, 11 insertions, 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 09:53:38 2006 NAKAMURA Usaku <usa@ruby-lang.org> * {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define @@ -227,6 +227,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 diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ac912d5d9a..36824903ed 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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"], |