From 849c996270c76ffe8a54583e892113792c440516 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Mar 2009 09:46:52 +0000
Subject: * Makefile.in (update-mspec): split from update-rubyspec.

* win32/Makefile.sub (update-{rubyspec,mspec}): added.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  6 +++++-
 Makefile.in        | 23 +++++++++++++----------
 win32/Makefile.sub | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38926cdf8e..dd581d549b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
-Fri Mar  6 18:37:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar  6 18:46:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
 	  phisical directory.
 
+	* Makefile.in (update-mspec): split from update-rubyspec.
+
+	* win32/Makefile.sub (update-{rubyspec,mspec}): added.
+
 Fri Mar  6 14:28:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, win32/Makefile.sub (INSNS): moved variable
diff --git a/Makefile.in b/Makefile.in
index d258e1ffcf..975f127b6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,23 +250,26 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 up::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
-update-rubyspec: 
-	@if [ -d $(srcdir)/spec/mspec ]; then \
-	  $(CHDIR) $(srcdir)/spec/mspec; \
+update-mspec:
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/mspec ]; then \
+	  cd spec/mspec; \
 	  echo updating mspec ...; \
-	  git pull; \
-	  cd ../..; \
+	  exec git pull; \
 	else \
 	  echo retrieving mspec ...; \
-	  git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
+	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
 	fi
-	@if [ -d $(srcdir)/spec/rubyspec ]; then \
-	  $(CHDIR) $(srcdir)/spec/rubyspec; \
+
+update-rubyspec: update-mspec
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/rubyspec ]; then \
+	  cd spec/rubyspec; \
 	  echo updating rubyspec ...; \
-	  git pull; \
+	  exec git pull; \
 	else \
 	  echo retrieving rubyspec ...; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
+	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
 
 test-rubyspec:
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index aede5357e0..e0657c7158 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -306,6 +306,24 @@ up::
 
 !include $(srcdir)/common.mk
 
+update-mspec:
+!if exist($(srcdir)/spec/mspec)
+	@echo updating mspec ...
+	@cd $(srcdir:/=\)\spec\mspec && git pull
+!else
+	@echo retrieving mspec ...
+	@cd $(srcdir:/=\) && git clone $(MSPEC_GIT_URL) spec/mspec
+!endif
+
+update-rubyspec: update-mspec
+!if exist($(srcdir)/spec/rubyspec)
+	@echo updating rubyspec ...
+	@cd $(srcdir:/=\)\spec\rubyspec && git pull
+!else
+	@echo retrieving rubyspec ...
+	@cd $(srcdir:/=\) && git clone $(RUBYSPEC_GIT_URL) spec/rubyspec
+!endif
+
 $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in
 	$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
 	@echo $(MKFILES) should be updated, re-run $(MAKE).
-- 
cgit v1.2.3