diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 14:03:03 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 14:03:03 +0000 |
| commit | 0c694317dd2e036f6bca362d6b53bee43069d868 (patch) | |
| tree | a0a8432c4f30c8a9d3626cd7ad190aaa3c46bcf0 | |
| parent | c6271c79680536f8d8fc53410fc8637b49ffb1bd (diff) | |
* {bcc32,win32}/Makefile.sub (ruby_version): follow changes in
configure.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 19 | ||||
| -rw-r--r-- | win32/Makefile.sub | 18 |
3 files changed, 28 insertions, 14 deletions
@@ -1,3 +1,8 @@ +Tue Jul 15 23:00:17 2008 NAKAMURA Usaku <[email protected]> + + * {bcc32,win32}/Makefile.sub (ruby_version): follow changes in + configure.in. + Tue Jul 15 21:58:20 2008 Nobuyoshi Nakada <[email protected]> * ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 651107dee9..f95013ccba 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -11,6 +11,10 @@ OS = bccwin32 !error RT not defined. Retry from configure pass. !endif +!if !defined(ruby_version) +ruby_version = $(MAJOR).$(MINOR) +!endif + ## variables may be overridden by $(compile_dir)/Makefile !ifndef srcdir srcdir = .. @@ -105,7 +109,7 @@ datadir = /share EXTOUT = .ext !endif !ifndef RIDATADIR -RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system +RIDATADIR = $(DESTDIR)$(datadir)/ri/$(ruby_version)/system !endif !ifndef TESTUI TESTUI = console @@ -295,15 +299,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#define STACK_GROW_DIRECTION -1 \#define DEFAULT_KCODE KCODE_NONE \#define DLEXT ".so" -\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)" +\#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)" +\#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)" +\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(ruby_version)" \#define RUBY_PLATFORM "$(ARCH)-$(OS)" -\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" -\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" -\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" +\#define RUBY_ARCHLIB "/lib/ruby/$(ruby_version)/$(ARCH)-$(OS)" +\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(ruby_version)/$(ARCH)-$(OS)" +\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(ruby_version)/$(ARCH)-$(OS)" | @exit > $@ @@ -414,6 +418,7 @@ s,@COMMON_HEADERS@,winsock2.h windows.h,;t t s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t s,@EXPORT_PREFIX@,_,;t t s,@arch@,$(ARCH)-$(OS),;t t +s,@ruby_version@,$(ruby_version),;t t s,@sitearch@,$(ARCH)-$(OS),;t t s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e632b067e6..de981926c5 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -98,6 +98,9 @@ OS = mswin32 !endif arch = $(ARCH)-$(OS) +!if !defined(ruby_version) +ruby_version = $(MAJOR).$(MINOR) +!endif !ifndef RUBY_SO_NAME RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR) @@ -122,7 +125,7 @@ datadir = /share EXTOUT = .ext !endif !ifndef RIDATADIR -RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system +RIDATADIR = $(DESTDIR)$(datadir)/ri/$(ruby_version)/system !endif !ifndef TESTUI TESTUI = console @@ -397,15 +400,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define DEFAULT_KCODE KCODE_NONE #define DLEXT ".so" #define DLEXT2 ".dll" -#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)" +#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)" +#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)" +#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(ruby_version)" #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)" +#define RUBY_ARCHLIB "/lib/ruby/$(ruby_version)/$(ARCH)-$(OS)" +#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)-$(OS)"!="$$(ARCH)-$$(OS)" @@ -552,6 +555,7 @@ s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(OS),;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,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t |