diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-19 03:25:48 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-19 03:25:48 +0000 |
| commit | fc23f8c695efd04a1ca05a4674da5408bbc4082c (patch) | |
| tree | 3e5a5acf4f0a793f62ac724dd852cc733fe4302e /win32 | |
| parent | 2e4dfbca26615f99db7e411cbceed1c02abbd45a (diff) | |
merge revision(s) 39201,39202:
* win32/Makefile.sub (config.status): site and vendor directories
should use sitearch, not arch. [ruby-dev:46964] [Bug #7823]
* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
should use sitearch, not arch. [ruby-dev:46964] [Bug #7823]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5ac8ca1ea4..4346e73751 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -850,10 +850,10 @@ s,@rubylibprefix@,$${prefix}/lib/$${RUBY_BASE_NAME},;t t s,@rubyarchdir@,$${rubylibdir}/$${arch},;t t s,@rubylibdir@,$${rubylibprefix}/$${ruby_version},;t t s,@sitedir@,$${rubylibprefix}/site_ruby,;t t -s,@sitearchdir@,$${sitelibdir}/$${arch},;t t +s,@sitearchdir@,$${sitelibdir}/$${sitearch},;t t s,@sitelibdir@,$${sitedir}/$${ruby_version},;t t s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t -s,@vendorarchdir@,$${vendirlibdir}/$${arch},;t t +s,@vendorarchdir@,$${vendirlibdir}/$${sitearch},;t t s,@vendorlibdir@,$${vendordir}/$${ruby_version},;t t s,@rubyhdrdir@,$$(includedir)/$${RUBY_BASE_NAME}-$$(ruby_version),;t t s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t |