2 files changed, 37 insertions, 2 deletions
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index d68fd19f8a..123a3f23c8 100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -20,6 +20,7 @@ if "%1" == "--program-suffix" goto :suffix
 if "%1" == "--program-name" goto :progname
 if "%1" == "--enable-install-doc" goto :enable-rdoc
 if "%1" == "--disable-install-doc" goto :disable-rdoc
+if "%1" == "--extout" goto :extout
 if "%1" == "-h" goto :help
 if "%1" == "--help" goto :help
   echo>> ~tmp~.mak 	"%1" \
@@ -67,6 +68,11 @@ goto :loop
   echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \
   shift
 goto :loop
+:extout
+  echo>> ~tmp~.mak 	"EXTOUT=%2" \
+  shift
+  shift
+goto :loop
 :help
   echo Configuration:
   echo   --help                  display this help
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 5d4a372c94..d6120d10cb 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -14,7 +14,7 @@ prefix = /usr
 !endif
 OS = bccwin32
 RT = $(OS)
-INCLUDE = !include
+BANG = !
 APPEND = echo>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
@@ -34,11 +34,24 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 	@echo Creating $(MAKEFILE)
 	@type > $(MAKEFILE) &&|
 \#\#\# Makefile for ruby $(OS) \#\#\#
+$(BANG)ifndef srcdir
 srcdir = $(srcdir:\=/)
+$(BANG)endif
+$(BANG)ifndef prefix
 prefix = $(prefix:\=/)
+$(BANG)endif
+$(BANG)ifndef EXTSTATIC
 EXTSTATIC = $(EXTSTATIC)
+$(BANG)endif
 !if defined(RDOCTARGET)
+$(BANG)ifndef RDOCTARGET
 RDOCTARGET = $(RDOCTARGET)
+$(BANG)endif
+!endif
+!if defined(EXTOUT)
+$(BANG)ifndef EXTOUT
+EXTOUT = $(EXTOUT)
+$(BANG)endif
 !endif
 |
 	@cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
@@ -54,28 +67,44 @@ TEENY = RUBY_VERSION_TEENY
 !if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
 	@type >> $(MAKEFILE) &&|
 !if defined(PROCESSOR_ARCHITECTURE)
+$(BANG)ifndef PROCESSOR_ARCHITECTURE
 PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
+$(BANG)endif
 !endif
 !if defined(PROCESSOR_LEVEL)
+$(BANG)ifndef PROCESSOR_LEVEL
 PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
+$(BANG)endif
 !endif
 
 |
 !endif
 
 -alpha-: nul
+	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
+	@$(APPEND) !endif
 -ix86-: nul
+	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
+	@$(APPEND) !endif
 
 -i386-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 3
+	@$(APPEND) !endif
 -i486-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 4
+	@$(APPEND) !endif
 -i586-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 5
+	@$(APPEND) !endif
 -i686-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 6
+	@$(APPEND) !endif
 
 -epilogue-: nul
 	@type >> $(MAKEFILE) &&|
@@ -90,7 +119,7 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
 \# LDFLAGS = -S:$$(STACK)
 \# RFLAGS = $$(iconinc)
 \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
+$(BANG)include $$(srcdir)bcc32/Makefile.sub
 |
 	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type "`$(MAKE)'" to make ruby for $(OS).