usa	2012-12-20 19:10:05 +0900 (Thu, 20 Dec 2012)

  New Revision: 38508

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

  Log:
    merge revision(s) 35924: [Backport #7587]
    
    installation dependencies
    
    * common.mk (do-install-{all,nodoc,arch}): fix installation
      dependencies so build exts also.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/common.mk
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/common.mk
===================================================================
--- ruby_1_9_3/common.mk	(revision 38507)
+++ ruby_1_9_3/common.mk	(revision 38508)
@@ -233,14 +233,14 @@ $(ruby_pc): $(srcdir)/template/ruby.pc.i https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/common.mk#L233
 
 install-all: docs pre-install-all do-install-all post-install-all
 pre-install-all:: pre-install-local pre-install-ext pre-install-doc
-do-install-all: $(PROGRAM)
+do-install-all: all
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
 post-install-all:: post-install-local post-install-ext post-install-doc
 	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: $(PREP)
+do-install-nodoc: main
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
 post-install-nodoc:: post-install-local post-install-ext
 
@@ -258,7 +258,7 @@ post-install-ext:: post-install-ext-arch https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/common.mk#L258
 
 install-arch: pre-install-arch do-install-arch post-install-arch
 pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch: $(PREP)
+do-install-arch: main
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-install-arch:: post-install-bin post-install-ext-arch
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38507)
+++ ruby_1_9_3/version.h	(revision 38508)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 354
+#define RUBY_PATCHLEVEL 355
 
 #define RUBY_RELEASE_DATE "2012-12-20"
 #define RUBY_RELEASE_YEAR 2012

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r35924


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