summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 06:16:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 06:16:16 +0000
commit18ffdcf7417e1680e84d86b1615f30933274dd1c (patch)
tree9d24b92cff24a25d5743a4d4e56bafa3c4dfb753
parent07f8c878e9c599c0062e21a96f002853a8226542 (diff)
* common.mk (install-rdoc), configure.in (RDOCTARGET): removed
circular dependency. [ruby-dev:39339] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk1
-rw-r--r--configure.in2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae3f078afc..cb880443c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 15 15:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (install-rdoc), configure.in (RDOCTARGET): removed
+ circular dependency. [ruby-dev:39339]
+
Tue Sep 15 10:48:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (install-all): target to install all.
diff --git a/common.mk b/common.mk
index af7fb520b9..e47dddbf46 100644
--- a/common.mk
+++ b/common.mk
@@ -112,6 +112,7 @@ ruby.imp: $(OBJS)
@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-$(RDOCTARGET)
+install-rdoc: install-all
doc-all: rdoc
install-all: doc-all pre-install-all do-install-all post-install-all
diff --git a/configure.in b/configure.in
index 36f8035e5b..6006a6b217 100644
--- a/configure.in
+++ b/configure.in
@@ -1608,7 +1608,7 @@ AC_ARG_ENABLE(install-doc,
AS_HELP_STRING([--enable-install-doc], [build and install rdoc indexes during install ]),
[install_doc=$enableval], [install_doc=no])
if test "$install_doc" != no; then
- RDOCTARGET="all"
+ RDOCTARGET="rdoc"
else
RDOCTARGET="nodoc"
fi