diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 18 |
2 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Tue Jul 15 22:34:03 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (ruby_version): follow changes in configure.in. + Tue Jul 15 21:58:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 513b70c4af..271bcf4384 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -109,6 +109,9 @@ PLATFORM = mswin32 !endif arch = $(ARCH)-$(PLATFORM) +!if !defined(ruby_version) +ruby_version = $(MAJOR).$(MINOR).$(TEENY) +!endif !ifndef RUBY_SO_NAME RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY) @@ -461,15 +464,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !endif #define DEFAULT_KCODE KCODE_NONE #define DLEXT ".so" -#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)" +#define RUBY_LIB "/lib/ruby/$(ruby_version)" #define RUBY_SITE_LIB "/lib/ruby/site_ruby" -#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)" +#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(ruby_version)" #define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby" -#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)" +#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(ruby_version)" #define RUBY_PLATFORM "$(arch)" -#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(PLATFORM)" -#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)" -#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)" +#define RUBY_ARCHLIB "/lib/ruby/$(ruby_version)/$(ARCH)-$(PLATFORM)" +#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(ruby_version)/$(ARCH)-$(RT)" +#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(ruby_version)/$(ARCH)-$(RT)" #define LIBRUBY_SO "$(LIBRUBY_SO)" #if 0 $(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)" @@ -635,9 +638,10 @@ s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(PLATFORM),;t t s,@sitearch@,$(ARCH)-$(RT),;t t +s,@ruby_version@,$(ruby_version),;t t s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t -s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t +s,@rubyhdrdir@,$$(includedir)/ruby-$$(ruby_version),;t t s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t |