summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 11:14:10 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 11:14:10 +0000
commitaed7f69bbcff47b894e320c1e1c9674169ce753f (patch)
tree181325fb0a8ef1043399fdae36cc5ebd5c2c5e9a
parent9ac3b79bcfe4dd89c4808cfcf43a01d3f7c6bf13 (diff)
* win32/setup.mak: maybe commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/setup.mak4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ee4d79b7a..4c3f8f1094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 6 20:13:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/setup.mak: maybe commit miss.
+
Fri Jun 6 18:25:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/iconv/utils.rb (default_test): override not to croak.
diff --git a/win32/setup.mak b/win32/setup.mak
index e87d1dbf39..1df2e2ed33 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -41,8 +41,8 @@ MAKE = nmake
srcdir = $(srcdir:\=/)
prefix = $(prefix:\=/)
EXTSTATIC = $(EXTSTATIC)
-!if "$(USE_WINSOCK2)" != "0"
-USE_WINSOCK2 = 1
+!if defined(USE_WINSOCK2)
+USE_WINSOCK2 = $(USE_WINSOCK2)
!endif
!if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET)