[前][次][番号順一覧][スレッド一覧]

ruby-changes:13171

From: nobu <ko1@a...>
Date: Mon, 14 Sep 2009 11:25:19 +0900 (JST)
Subject: [ruby-changes:13171] Ruby:r24923 (ruby_1_8, trunk): * configure.in, common.mk, */configure.bat (rdoc): make before

nobu	2009-09-14 11:23:47 +0900 (Mon, 14 Sep 2009)

  New Revision: 24923

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24923

  Log:
    * configure.in, common.mk, */configure.bat (rdoc): make before
      install if rdoc is enabled.  [ruby-dev:39325]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/bcc32/configure.bat
    branches/ruby_1_8/common.mk
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/win32/configure.bat
    branches/ruby_1_8/wince/configure.bat
    trunk/ChangeLog
    trunk/common.mk
    trunk/configure.in
    trunk/win32/configure.bat

Index: configure.in
===================================================================
--- configure.in	(revision 24922)
+++ configure.in	(revision 24923)
@@ -2120,7 +2120,9 @@
        AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
        [install_doc=$enableval], [install_doc=yes])
 if test "$install_doc" != no; then
-   RDOCTARGET="install-doc"
+    RDOCTARGET="rdoc"
+else
+    RDOCTARGET="nodoc"
 fi
 AC_SUBST(RDOCTARGET)
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24922)
+++ ChangeLog	(revision 24923)
@@ -1,3 +1,8 @@
+Mon Sep 14 11:23:45 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, common.mk, */configure.bat (rdoc): make before
+	  install if rdoc is enabled.  [ruby-dev:39325]
+
 Mon Sep 14 10:56:40 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (check-ruby): run all test of ruby itself.
Index: common.mk
===================================================================
--- common.mk	(revision 24922)
+++ common.mk	(revision 24923)
@@ -124,7 +124,7 @@
 
 COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb
 
-all: encs exts main
+all: encs exts main $(RDOCTARGET)
 
 main: exts
 	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
@@ -172,7 +172,7 @@
 ruby.imp: $(EXPORTOBJS)
 	@$(NM) -Pgp $(EXPORTOBJS) | 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-capi
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
@@ -337,6 +337,7 @@
 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
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 24922)
+++ win32/configure.bat	(revision 24923)
@@ -88,12 +88,12 @@
   shift
 goto :loop
 :enable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-doc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=rdoc" \
   echo>>confargs.tmp %1 \
   shift
 goto :loop
 :disable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=install-nodoc" \
+  echo>> ~tmp~.mak 	"RDOCTARGET=nodoc" \
   echo>>confargs.tmp %1 \
   shift
 goto :loop
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 24922)
+++ ruby_1_8/configure.in	(revision 24923)
@@ -1608,7 +1608,9 @@
        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)
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 24922)
+++ ruby_1_8/ChangeLog	(revision 24923)
@@ -1,3 +1,8 @@
+Mon Sep 14 11:23:45 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* common.mk (check-ruby): run all test of ruby itself.
Index: ruby_1_8/bcc32/configure.bat
===================================================================
--- ruby_1_8/bcc32/configure.bat	(revision 24922)
+++ ruby_1_8/bcc32/configure.bat	(revision 24923)
@@ -87,14 +87,14 @@
 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
Index: ruby_1_8/wince/configure.bat
===================================================================
--- ruby_1_8/wince/configure.bat	(revision 24922)
+++ ruby_1_8/wince/configure.bat	(revision 24923)
@@ -71,11 +71,11 @@
   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
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk	(revision 24922)
+++ ruby_1_8/common.mk	(revision 24923)
@@ -81,7 +81,7 @@
 
 VCS           = svn
 
-all: main
+all: main $(RDOCTARGET)
 
 main: exts
 	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
@@ -111,7 +111,7 @@
 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 @@
 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
Index: ruby_1_8/win32/configure.bat
===================================================================
--- ruby_1_8/win32/configure.bat	(revision 24922)
+++ ruby_1_8/win32/configure.bat	(revision 24923)
@@ -68,11 +68,11 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]