summaryrefslogtreecommitdiff
path: root/bcc32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-25 01:49:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-25 01:49:27 +0000
commit8b79dd5e82ea3bc54611811b16b65edc9d7b5822 (patch)
treef6b14afc840fffc2d996bdb81290cfa658b3191d /bcc32
parente08fca8bc0d390454826ed03840e6b1c14c6dc10 (diff)
* 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
Diffstat (limited to 'bcc32')
-rw-r--r--bcc32/Makefile.sub10
-rw-r--r--bcc32/setup.mak15
2 files changed, 16 insertions, 9 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 7e787b1..71d96a8 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 27cf911..dea7d6c 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)\"