diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | version.h | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (config.h): added RUBY_SITEARCH to use + different name from RUBY_ARCH. [ruby-core:26324] + Mon Oct 26 20:04:13 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails @@ -628,7 +628,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \ {$(VPATH)}oniguruma.h version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \ - {$(VPATH)}version.h $(srcdir)/revision.h + {$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-10-26" +#define RUBY_RELEASE_DATE "2009-10-27" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 680b3dea7..0ad8dfb02 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -118,6 +118,7 @@ PLATFORM = mswin32 !endif arch = $(ARCH)-$(PLATFORM) +sitearch = $(ARCH)-$(RT) !if !defined(ruby_version) ruby_version = $(MAJOR).$(MINOR).$(TEENY) !endif @@ -567,6 +568,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION #define RUBY_PLATFORM "$(arch)" +#define RUBY_SITEARCH "$(sitearch)" #define RUBY_COREDLL "$(RT)" #define RUBY_ARCHLIB RUBY_LIB"/"RUBY_ARCH #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2"/"RUBY_SITEARCH |