diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-25 01:49:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-25 01:49:27 +0000 |
| commit | 8b79dd5e82ea3bc54611811b16b65edc9d7b5822 (patch) | |
| tree | f6b14afc840fffc2d996bdb81290cfa658b3191d /bcc32/Makefile.sub | |
| parent | e08fca8bc0d390454826ed03840e6b1c14c6dc10 (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/Makefile.sub')
| -rw-r--r-- | bcc32/Makefile.sub | 10 |
1 files changed, 5 insertions, 5 deletions
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 |