From 2314a8fc4f033e6b5def315ddb9b30256df6f2e0 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 7 Feb 2013 11:55:14 +0000 Subject: [PATCH] * win32/Makefile.sub (config.status): added variables which were missing at r39130. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/Makefile.sub | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index f15db14816..c110b68ca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 7 20:52:40 2013 NAKAMURA Usaku + + * win32/Makefile.sub (config.status): added variables which were + missing at r39130. + Thu Feb 7 15:33:17 2013 Nobuyoshi Nakada * lib/mkmf.rb (MakeMakefile#merge_libs): insert following reversal diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 18ed7f3d48..5ac8ca1ea4 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -839,6 +839,10 @@ s,@COMMON_HEADERS@,$(COMMON_HEADERS),;t t s,@cleanobjs@,$$*.exp $$*.lib $$*.pdb,;t t s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t +s,@archlibdir@,$${libdir}/$${arch},;t t +s,@sitearchlibdir@,$${libdir}/$${sitearch},;t t +s,@archincludedir@,$${includedir}/$${arch},;t t +s,@sitearchincludedir@,$${includedir}/$${sitearch},;t t s,@arch@,$(ARCH)-$(PLATFORM),;t t s,@sitearch@,$(ARCH)-$(RT),;t t s,@ruby_version@,$(ruby_version),;t t @@ -846,10 +850,17 @@ 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,@sitelibdir@,$${sitedir}/$${ruby_version},;t t s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t +s,@vendorarchdir@,$${vendirlibdir}/$${arch},;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 s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t +s,@rubyarchhdrdir@,$$(rubyhdrdir)/$${arch},;t t +s,@sitearchhdrdir@,$$(sitehdrdir)/$${sitearch},;t t +s,@vendorarchhdrdir@,$$(vendorhdrdir)/$${sitearch},;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