* bcc32/Makefile.sub, win32/Makefile.sub (RUBY_SO_NAME, config.h):

  use $(MAJOR) and $(MINOR). based on Nobu's patch. [ruby-win32:413]

* bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
  and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]

* win32/Makefile.sub (config.h): add HAVE_FLOAT_H.

* win32/Makefile.sub (parse.obj): depend on win32/win32.h.


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

5 files changed, 45 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index dcc220e208..95d0f9e6cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Dec 25 10:36:20 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (RUBY_SO_NAME, config.h):
+	  use $(MAJOR) and $(MINOR). based on Nobu's patch. [ruby-win32:413]
+
+	* bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
+	  and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]
+
+	* win32/Makefile.sub (config.h): add HAVE_FLOAT_H.
+
+	* win32/Makefile.sub (parse.obj): depend on win32/win32.h.
+
 Tue Dec 24 23:49:16 2002  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/irb/completion.rb: Use Object#class rather than Object#type.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 7e787b18ff..71d96a892e 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -20,7 +20,7 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
 !endif
 !ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)17
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
 !endif
 !ifndef icondirs
 !ifdef ICONDIRS
@@ -248,12 +248,12 @@ config.h: Makefile $(srcdir)bcc32/Makefile.sub
 \#define DEFAULT_KCODE KCODE_NONE
 \#define DLEXT ".so"
 \#define DLEXT2 ".dll"
-\#define RUBY_LIB "/lib/ruby/1.7"
+\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
 \#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7"
+\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
 \#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/1.7/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/$(ARCH)-$(OS)"
+\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 
 \#define SIZEOF_INT     4
 \#define SIZEOF_SHORT   2
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 27cf91164a..dea7d6c29f 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -30,10 +30,17 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 
 -prologue-: nul
 	@echo Creating $(MAKEFILE)
-	@type > $(MAKEFILE) &&|
-\#\#\# Makefile for ruby $(OS) \#\#\#
-srcdir = $(srcdir:\=/)
+	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
+\#define COMMENT \#
+COMMENT Makefile for ruby $(OS)
+\#include "version.h"
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
 |
+	@copy $(MAKEFILE).i $(MAKEFILE) > nul
+	@del $(MAKEFILE).i
+	@$(APPEND) srcdir = $(srcdir:\=/)
 
 -generic-: nul
 !if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
@@ -68,7 +75,7 @@ srcdir = $(srcdir:\=/)
 \# OS = $(OS)
 \# RT = $(RT)
 \# RUBY_INSTALL_NAME = ruby
-\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)17
+\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
 \# prefix = /usr
 \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w-
 \# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 269e32bc95..5090d83e4f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -68,7 +68,7 @@ OS = mswin32
 RT = msvcrt
 
 !ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)17
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
 !endif
 
 !if !defined(prefix)
@@ -191,6 +191,7 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
 #define HAVE_STDLIB_H 1
 #define HAVE_STRING_H 1
 #define HAVE_MEMORY_H 1
+#define HAVE_FLOAT_H 1
 #define HAVE_OFF_T 1
 #define SIZEOF_INT 4
 #define SIZEOF_SHORT 2
@@ -265,12 +266,12 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
 #define DEFAULT_KCODE KCODE_NONE
 #define DLEXT ".so"
 #define DLEXT2 ".dll"
-#define RUBY_LIB "/lib/ruby/1.7"
+#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
 #define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
 #define RUBY_PLATFORM "$(ARCH)-$(OS)"
-#define RUBY_ARCHLIB "/lib/ruby/1.7/$(ARCH)-$(OS)"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/$(ARCH)-$(RT)"
+#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
 <<KEEP
 
 config.status: Makefile $(srcdir)/win32/Makefile.sub
@@ -604,7 +605,7 @@ pack.obj: {$(srcdir)}pack.c {$(srcdir)}ruby.h config.h \
 parse.obj: {$(srcdir)}parse.c {$(srcdir)}ruby.h config.h \
   {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \
   {$(srcdir)}env.h {$(srcdir)}node.h {$(srcdir)}st.h {$(srcdir)}regex.h \
-  {$(srcdir)}util.h {$(srcdir)}lex.c
+  {$(srcdir)}util.h {$(srcdir)}lex.c {$(srcdir)}/win32/win32.h
 prec.obj: {$(srcdir)}prec.c {$(srcdir)}ruby.h config.h \
   {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \
   {$(srcdir)}/win32/win32.h
diff --git a/win32/setup.mak b/win32/setup.mak
index 328afa0d78..1f2c7af8cf 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -29,11 +29,15 @@ i686-$(OS): -prologue- -i686- -epilogue-
 alpha-$(OS): -prologue- -alpha- -epilogue-
 
 -prologue-: nul
-	@echo Creating <<$(MAKEFILE)
-### Makefile for ruby $(OS) ###
-srcdir = $(srcdir:\=/)
-
-<<KEEP
+	@cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" > $(MAKEFILE)
+#define COMMENT #
+COMMENT Makefile for ruby $(OS)
+#include "version.h"
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
+<<
+	@$(APPEND) srcdir = $(srcdir:\=/)
 
 -generic-: nul
 !if defined($(ARCH)) || defined($(CPU))
@@ -67,7 +71,7 @@ $(CPU) = $(PROCESSOR_LEVEL)
 # OS = $(OS)
 # RT = $(RT)
 # RUBY_INSTALL_NAME = ruby
-# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)17
+# 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)\"