From 7eb193b9911e8dda2c5cb96632775b4c27285bbb Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 20 Dec 2012 10:10:05 +0000 Subject: merge revision(s) 35924: [Backport #7587] installation dependencies * common.mk (do-install-{all,nodoc,arch}): fix installation dependencies so build exts also. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 6 +++--- version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index 0cf3a125a3..ccc964701e 100644 --- a/common.mk +++ b/common.mk @@ -233,14 +233,14 @@ $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status 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 post-install-ext-comm 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 diff --git a/version.h b/version.h index 5bc80a36ea..b56264d9dc 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #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 -- cgit v1.2.3