summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-20 14:18:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-20 14:18:19 +0000
commitb560eab5846fa8a390f56b240e63bc754eeb0b3f (patch)
tree21f3f6e767e7ee853027f0ad891015e2dff80ddd
parent22c07519c05c07ef8a38edaceca163a578b89211 (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--ChangeLog8
-rw-r--r--common.mk1
-rw-r--r--lib/mkmf.rb4
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d6ab5c0627a..2cb54153013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/common.mk b/common.mk
index ad4d064136a..dd8813b3671 100644
--- a/common.mk
+++ b/common.mk
@@ -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 ac912d5d9a7..36824903edc 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"],