From fc3b17968b0ca073498e0ee7f3e1be84070d6b97 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 4 Nov 2007 15:26:21 +0000 Subject: * 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 --- win32/Makefile.sub | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 44b7a262a0..c017abae01 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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 -- cgit v1.2.3