* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in

  config.status for backward compatibility.  fixed: [ruby-core:04649]


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

10 files changed, 36 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 1378c4c562..2c8720af9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
-Sat Apr  2 22:30:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr  2 22:34:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (CP, INSTALL): get rid of less portable options.
 
 	* lib/mkmf.rb (configuration, create_makefile): correct configuration
 	  variable.
 
+	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
+	  config.status for backward compatibility.  fixed: [ruby-core:04649]
+
 Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 5fe7937e0c..78e1309650 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -292,7 +292,7 @@ s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 91a4028c94..d68fd19f8a 100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -72,7 +72,7 @@ goto :loop
   echo   --help                  display this help

   echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

   echo Installation directories:

-  echo   --prefix=PREFIX         install files in PREFIX [/usr]

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

   echo System types:

   echo   --target=TARGET         configure for TARGET [i386-bccwin32]

   echo Optional Package:

diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 1a243af9b6..5d4a372c94 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -9,7 +9,9 @@ srcdir = $(bcc32dir:/bcc32/=/)
 !else
 srcdir = $(bcc32dir)../
 !endif
-
+!ifndef prefix
+prefix = /usr
+!endif
 OS = bccwin32
 RT = $(OS)
 INCLUDE = !include
@@ -33,6 +35,11 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 	@type > $(MAKEFILE) &&|
 \#\#\# Makefile for ruby $(OS) \#\#\#
 srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
 |
 	@cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
 \#include "version.h"
@@ -77,7 +84,6 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
 \# RT = $(RT)
 \# RUBY_INSTALL_NAME = ruby
 \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# prefix = /usr
 \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 \# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
 \# STACK = 0x2000000
@@ -86,6 +92,5 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
 \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
 $(INCLUDE) $$(srcdir)bcc32/Makefile.sub
 |
-	@if exist config.h del config.h
-	@if exist config.status del config.status
+	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b65d3e4f11..8e0144c660 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -290,7 +290,7 @@ s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
diff --git a/win32/configure.bat b/win32/configure.bat
index 11383e08bd..b2b3a175bf 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -72,7 +72,7 @@ goto :loop
   echo   --help                  display this help

   echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

   echo Installation directories:

-  echo   --prefix=PREFIX         install files in PREFIX [/usr]

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

   echo System types:

   echo   --target=TARGET         configure for TARGET [i386-mswin32]

   echo Optional Package:

diff --git a/win32/setup.mak b/win32/setup.mak
index 5e2ea21e5f..fa0c260001 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=)
 !else
 srcdir = $(WIN32DIR)/..
 !endif
+!ifndef prefix
+prefix = /usr
+!endif
 OS = mswin32
 RT = msvcrt
 INCLUDE = !include
@@ -20,6 +23,7 @@ MAKEFILE = Makefile
 !endif
 ARCH = PROCESSOR_ARCHITECTURE
 CPU = PROCESSOR_LEVEL
+CPP = cl -nologo -EP
 
 all: -prologue- -generic- -epilogue-
 i386-$(OS): -prologue- -i386- -epilogue-
@@ -32,11 +36,13 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 	@type << > $(MAKEFILE)
 ### Makefile for ruby $(OS) ###
 srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
 !endif
 <<
-	@cl -nologo -EP -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
+	@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
@@ -76,7 +82,6 @@ $(CPU) = $(PROCESSOR_LEVEL)
 # RT = $(RT)
 # RUBY_INSTALL_NAME = ruby
 # RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-# prefix = /usr
 # CFLAGS = -nologo -MD $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
 # CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
 # STACK = 0x2000000
@@ -87,6 +92,5 @@ $(CPU) = $(PROCESSOR_LEVEL)
 
 $(INCLUDE) $$(srcdir)/win32/Makefile.sub
 <<
-	@if exist config.h del config.h
-	@if exist config.status del config.status
+	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type `$(MAKE)' to make ruby for $(OS).
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 1dfa07de1c..5306f5afec 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -316,7 +316,7 @@ s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
diff --git a/wince/configure.bat b/wince/configure.bat
index 3ec2757294..3f208d1487 100644
--- a/wince/configure.bat
+++ b/wince/configure.bat
@@ -82,7 +82,7 @@ goto :loop
   echo   --help                  display this help

   echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

   echo Installation directories:

-  echo   --prefix=PREFIX         install files in PREFIX [/usr]

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

   echo System types:

   echo   --target=TARGET         configure for TARGET [i386-mswin32]

   echo Optional Package:

diff --git a/wince/setup.mak b/wince/setup.mak
index adab346664..14663df573 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=)
 !else
 srcdir = $(WIN32DIR)/..
 !endif
+!ifndef prefix
+prefix = /usr
+!endif
 OS = mswince
 RT = msvcrt
 INCLUDE = !include
@@ -47,6 +50,11 @@ armv4i-sig3-wince: -prologue- -armv4i- -sig3- -epilogue-
 	@type << > $(MAKEFILE)
 ### Makefile for ruby $(OS) ###
 srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
 <<
 	@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
 #include "version.h"
@@ -216,7 +224,6 @@ RUBY_SO_NAME = $(RUBY_SO_NAME)
 !else
 # RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
 !endif
-# prefix = /usr
 # CFLAGS = -nologo $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
 CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
            $$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$$(SUBSYSVERSION:.=) \
@@ -230,6 +237,5 @@ CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
 
 $(INCLUDE) $$(srcdir)/wince/Makefile.sub
 <<
-	@if exist config.h del config.h
-	@if exist config.status del config.status
+	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type `$(MAKE)' to make ruby for $(OS).