From c206448c4078690fff086a5a68a98f3c840b72cb Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Sep 2009 02:23:47 +0000
Subject: [PATCH] * configure.in, common.mk, */configure.bat (rdoc): make
 before   install if rdoc is enabled.  [ruby-dev:39325]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 5 +++++
 bcc32/configure.bat | 4 ++--
 common.mk           | 5 +++--
 configure.in        | 4 +++-
 win32/configure.bat | 4 ++--
 wince/configure.bat | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cef2a10fba..d878769284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 11:23:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, common.mk, */configure.bat (rdoc): make before
+	  install if rdoc is enabled.  [ruby-dev:39325]
+
 Mon Sep 14 11:10:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (check-ruby): run all test of ruby itself.
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 95575cbc60..937bf7dc0b 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -87,14 +87,14 @@ goto :loop
 goto :loop
 :enable-rdoc
   echo>>confargs.mk !ifndef RDOCTARGET
-  echo>>confargs.mk RDOCTARGET = install-doc
+  echo>>confargs.mk RDOCTARGET = rdoc
   echo>>confargs.mk !endif
   echo>>confargs.tmp 	%1 \
   shift
 goto :loop
 :disable-rdoc
   echo>>confargs.mk !ifndef RDOCTARGET
-  echo>>confargs.mk RDOCTARGET = install-nodoc
+  echo>>confargs.mk RDOCTARGET = nodoc
   echo>>confargs.mk !endif
   echo>>confargs.tmp 	%1 \
   shift
diff --git a/common.mk b/common.mk
index 1db9bc061e..c335377b41 100644
--- a/common.mk
+++ b/common.mk
@@ -81,7 +81,7 @@ TESTWORKDIR   = testwork
 
 VCS           = svn
 
-all: main
+all: main $(RDOCTARGET)
 
 main: exts
 	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
@@ -111,7 +111,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 ruby.imp: $(OBJS)
 	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
-install: install-nodoc $(RDOCTARGET)
+install: install-nodoc install-$(RDOCTARGET)
 install-all: install-nodoc install-doc
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
@@ -272,6 +272,7 @@ post-install-doc::
 rdoc: $(PROGRAM) PHONY
 	@echo Generating RDoc documentation
 	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+nodoc: PHONY
 
 what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
diff --git a/configure.in b/configure.in
index 304b2009fa..6006a6b217 100644
--- a/configure.in
+++ b/configure.in
@@ -1608,7 +1608,9 @@ 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="install-doc"
+    RDOCTARGET="rdoc"
+else
+    RDOCTARGET="nodoc"
 fi
 AC_SUBST(RDOCTARGET)
 
diff --git a/win32/configure.bat b/win32/configure.bat
index f4f24a5ed7..f63e95ac1d 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -68,11 +68,11 @@ goto :loop
   shift
 goto :loop
 :enable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-doc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=rdoc" \
   shift
 goto :loop
 :disable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-nodoc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=nodoc" \
   shift
 goto :loop
 :extout
diff --git a/wince/configure.bat b/wince/configure.bat
index 66837bb646..4f9e652ef2 100755
--- a/wince/configure.bat
+++ b/wince/configure.bat
@@ -71,11 +71,11 @@ goto :loop
   shift
 goto :loop
 :enable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-doc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=rdoc" \
   shift
 goto :loop
 :disable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-nodoc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=nodoc" \
   shift
 goto :loop
 :extout