summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-22 02:24:11 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-22 02:24:11 +0000
commit94eed2b622b36881fdae73142b41bc23738e90b2 (patch)
treee53292ab13386b02ebda5b2a06a13f03d6fa5b01 /win32/Makefile.sub
parent3f63918c5cc18f55519ff35d1708add2339e9fa3 (diff)
* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
a space will be inserted on the top of the line. * win32/Makefile.sub (MKFILES): stop make process if Makefile is updated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub3
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 5387d032fc..8ce9cf736e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -272,6 +272,7 @@ rubyw: $(WPROGRAM)
$(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
@echo $(MKFILES) should be updated, re-run $(MAKE).
+ @exit 1
CONFIG_H = ./.config.h.time
@@ -292,7 +293,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected.
#endif
!if defined(USE_WINSOCK2)
-#define USE_WINSOCK2 1
+#define USE_WINSOCK2 $(USE_WINSOCK2)
!endif
#define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1