1 files changed, 70 insertions, 39 deletions
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 6017ecc3cf..27cf91164a 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -1,50 +1,81 @@
 # -*- makefile -*-
 
-!if "$(bcc32dir)" == "bcc32/"
+!if "$(srcdir)" != ""
+bcc32dir = $(srcdir)bcc32/
+!elseif "$(bcc32dir)" == "bcc32/"
 srcdir = ./
-!elseif "$(bcc32dir)" == "../bcc32/"
-srcdir = ../
+!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
+srcdir = $(bcc32dir:/bcc32/=/)
 !else
 srcdir = $(bcc32dir)../
 !endif
 
 OS = bccwin32
+RT = $(OS)
+INCLUDE = !include
+APPEND = echo>>$(MAKEFILE)
+!ifdef MAKEFILE
+MAKE = $(MAKE) -f $(MAKEFILE)
+!else
+MAKEFILE = Makefile
+!endif
 
-all: ext makefile
-
-makefile: make_s make_e
-
-make_s:
-	@if exist makefile @del makefile
-	@echo ### makefile for ruby $(OS) ###> makefile
-	@echo srcdir = $(srcdir:\=/)>> makefile
-	@echo RUBY_INSTALL_NAME = ruby>> makefile
-	@echo RUBY_SO_NAME = $(OS)_$$(RUBY_INSTALL_NAME)17>> makefile
-
-make_e:
-	@echo !INCLUDE $$(srcdir)bcc32/makefile.sub>> makefile
-	@echo type `make' to make ruby for bccwin32.
-
-ext:
-	@if not exist $@\* mkdir $@
-
-pl3:
-	@echo PROCESSOR_LEVEL = 3 >> makefile
-
-pl4:
-	@echo PROCESSOR_LEVEL = 4 >> makefile
-
-pl5:
-	@echo PROCESSOR_LEVEL = 5 >> makefile
-
-pl6:
-	@echo PROCESSOR_LEVEL = 6 >> makefile
-
-3: ext make_s pl3 make_e
-
-4: ext make_s pl4 make_e
-
-5: ext make_s pl5 make_e
+all: Makefile
+Makefile: -prologue- -generic- -epilogue-
+i386-$(OS): -prologue- -i386- -epilogue-
+i486-$(OS): -prologue- -i486- -epilogue-
+i586-$(OS): -prologue- -i586- -epilogue-
+i686-$(OS): -prologue- -i686- -epilogue-
+alpha-$(OS): -prologue- -alpha- -epilogue-
+
+-prologue-: nul
+	@echo Creating $(MAKEFILE)
+	@type > $(MAKEFILE) &&|
+\#\#\# Makefile for ruby $(OS) \#\#\#
+srcdir = $(srcdir:\=/)
+|
+
+-generic-: nul
+!if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
+	@type >> $(MAKEFILE) &&|
+!if defined(PROCESSOR_ARCHITECTURE)
+	@$(APPEND) PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
+!endif
+!if defined(PROCESSOR_LEVEL)
+	@$(APPEND) PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
+!endif
 
-6: ext make_s pl6 make_e
+|
+!endif
 
+-alpha-: nul
+	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
+-ix86-: nul
+	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
+
+-i386-: -ix86-
+	@$(APPEND) PROCESSOR_LEVEL = 3
+-i486-: -ix86-
+	@$(APPEND) PROCESSOR_LEVEL = 4
+-i586-: -ix86-
+	@$(APPEND) PROCESSOR_LEVEL = 5
+-i686-: -ix86-
+	@$(APPEND) PROCESSOR_LEVEL = 6
+
+-epilogue-: nul
+	@type >> $(MAKEFILE) &&|
+
+\# OS = $(OS)
+\# RT = $(RT)
+\# RUBY_INSTALL_NAME = ruby
+\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)17
+\# prefix = /usr
+\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w-
+\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
+\# STACK = 0x2000000
+\# LDFLAGS = -S:$$(STACK)
+\# RFLAGS = $$(iconinc)
+\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
+$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
+|
+	@echo type "`$(MAKE)'" to make ruby for $(OS).