summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
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 /win32/Makefile.sub
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 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub13
1 files changed, 7 insertions, 6 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 269e32b..5090d83 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