summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-14 09:49:56 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-14 09:49:56 +0000
commitc6e6380665c83a54d32c0a7ee2ff80d6705a778b (patch)
tree9683b5db803d5e1ea374b377390f29f5dc39c69e
parent8068d73cc11957c37a6869d4e0325191f7a9a040 (diff)
* win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
mswin32 port. If you changed win32/configure.bat, you should change setup.mak too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/setup.mak4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index abcf956ac75..df106b9aae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 14 18:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
+ mswin32 port. If you changed win32/configure.bat, you should change
+ setup.mak too.
+
Mon Feb 14 17:28:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_system.rb (TestSystem#test_system_at):
diff --git a/win32/setup.mak b/win32/setup.mak
index 69444d019b8..0733e99bbb1 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -58,6 +58,10 @@ BASERUBY = $(BASERUBY:/=\)
!if defined(NTVER)
NTVER = $(NTVER)
!endif
+!if defined(USE_RUBYGEMS)
+USE_RUBYGEMS = $(USE_RUBYGEMS)
+!endif
+
<<
!if !defined(BASERUBY)
@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)