mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/Makefile.sub: vendor_ruby support.
* configure.in (RUBY_LIB): duplicated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
af9c868eae
commit
fc3b17968b
4 changed files with 14 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
Mon Nov 5 00:24:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/Makefile.sub: vendor_ruby support.
|
||||
|
||||
* configure.in (RUBY_LIB): duplicated.
|
||||
|
||||
Mon Nov 5 00:01:33 2007 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* re.c (rb_reg_quote): quote \v as well.
|
||||
|
|
|
@ -1603,7 +1603,6 @@ case "$target_os" in
|
|||
esac
|
||||
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
|
||||
|
||||
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
|
||||
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
|
||||
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.9.0"
|
||||
#define RUBY_RELEASE_DATE "2007-11-04"
|
||||
#define RUBY_RELEASE_DATE "2007-11-05"
|
||||
#define RUBY_VERSION_CODE 190
|
||||
#define RUBY_RELEASE_CODE 20071104
|
||||
#define RUBY_RELEASE_CODE 20071105
|
||||
#define RUBY_PATCHLEVEL 0
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_YEAR 2007
|
||||
#define RUBY_RELEASE_MONTH 11
|
||||
#define RUBY_RELEASE_DAY 4
|
||||
#define RUBY_RELEASE_DAY 5
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
|
@ -346,9 +346,12 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
|
|||
#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
|
||||
#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
|
||||
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
|
||||
#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby"
|
||||
#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)"
|
||||
#define RUBY_PLATFORM "$(arch)"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
<<
|
||||
@exit > $(@:/=\)
|
||||
|
||||
|
@ -482,8 +485,10 @@ s,@EXPORT_PREFIX@, ,;t t
|
|||
s,@arch@,$(ARCH)-$(OS),;t t
|
||||
s,@sitearch@,$(ARCH)-$(RT),;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),;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
|
||||
s,@configure_input@,$$configure_input,;t t
|
||||
s,@srcdir@,$(srcdir),;t t
|
||||
|
|
Loading…
Reference in a new issue