summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-17 02:33:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-17 02:33:29 +0000
commitc93aad61c61f9b1d3c6e4c394be9ddf1949d5ff0 (patch)
treeede33282c3360ae499fb8897d013f0a4e99bb6cd
parentff5a875f8c57f7fa6499dcf85bdda26249f7f8bd (diff)
downloadruby-c93aad61c61f9b1d3c6e4c394be9ddf1949d5ff0.tar.gz
ruby-c93aad61c61f9b1d3c6e4c394be9ddf1949d5ff0.tar.xz
ruby-c93aad61c61f9b1d3c6e4c394be9ddf1949d5ff0.zip
* win32/setup.mak (MAKE): workaround for nmake 8.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/setup.mak1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b873ff8f..a13bbebba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 17 11:31:47 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/setup.mak (MAKE): workaround for nmake 8.
+
Tue Jan 17 11:06:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
diff --git a/win32/setup.mak b/win32/setup.mak
index 477974175..ab7960090 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -37,6 +37,7 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
-basic-vars-: nul
@type << > $(MAKEFILE)
### Makefile for ruby $(OS) ###
+MAKE = nmake
srcdir = $(srcdir:\=/)
prefix = $(prefix:\=/)
EXTSTATIC = $(EXTSTATIC)