From 8b79dd5e82ea3bc54611811b16b65edc9d7b5822 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 25 Dec 2002 01:49:27 +0000 Subject: * 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 --- bcc32/setup.mak | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'bcc32/setup.mak') 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)\" -- cgit v1.2.3