* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:

  add extout option.

* bcc32/setup.mak: make configuration variables overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

7 files changed, 62 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 71d19d405e..1ef719c0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
+	  add extout option.
+
+	* bcc32/setup.mak: make configuration variables overridable.
+
 Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 717104af18..c1b3cdb64c 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 991239a428..dac52bf92b 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) -P- -DRUBY_EXTERN="//" -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).
diff --git a/win32/configure.bat b/win32/configure.bat
index be9cd97297..00c9347214 100755
--- a/win32/configure.bat
+++ b/win32/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 	"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/win32/setup.mak b/win32/setup.mak
index a8ba23586e..c92c08310f 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -43,6 +43,9 @@ EXTSTATIC = $(EXTSTATIC)
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
 !endif
+!if defined(EXTOUT)
+EXTOUT = $(EXTOUT)
+!endif
 <<
 
 -system-vars-: -osname- -runtime-
diff --git a/wince/configure.bat b/wince/configure.bat
index 9d83b0a484..2c4a88fa16 100644
--- a/wince/configure.bat
+++ b/wince/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

 if "%1" == "CC" goto :define

@@ -77,6 +78,11 @@ goto :loop
   echo>> ~tmp~.mak 	"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/wince/setup.mak b/wince/setup.mak
index 14663df573..629ea993e4 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -55,6 +55,9 @@ EXTSTATIC = $(EXTSTATIC)
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
 !endif
+!if defined(EXTOUT)
+EXTOUT = $(EXTOUT)
+!endif
 <<
 	@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
 #include "version.h"