[前][次][番号順一覧][スレッド一覧]

ruby-changes:48027

From: nobu <ko1@a...>
Date: Mon, 9 Oct 2017 12:08:06 +0900 (JST)
Subject: [ruby-changes:48027] nobu:r60141 (trunk): verconf.h.tmpl: site and vendor directories

nobu	2017-10-09 12:08:02 +0900 (Mon, 09 Oct 2017)

  New Revision: 60141

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60141

  Log:
    verconf.h.tmpl: site and vendor directories
    
    * template/verconf.h.tmpl: disable site and vendor directories
      when removed.  based on the path by arnoldwald (arnold w) at
      [ruby-core:81563].  [Bug #13631]

  Modified files:
    trunk/template/verconf.h.tmpl
Index: template/verconf.h.tmpl
===================================================================
--- template/verconf.h.tmpl	(revision 60140)
+++ template/verconf.h.tmpl	(revision 60141)
@@ -21,13 +21,13 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.tmpl#L21
 #define RUBY_SITEARCH_PREFIX_FOR(arch)	"${rubysitearchprefix}"
 #define RUBY_LIB			"${rubylibdir}"
 #define RUBY_ARCH_LIB_FOR(arch) 	"${rubyarchdir}"
-% if C["sitedir"] == "no"
+% if !C["sitedir"] || C["sitedir"] == "no"
 #define NO_RUBY_SITE_LIB		1
 % else
 #define RUBY_SITE_LIB			"${sitedir}"
 #define RUBY_SITE_ARCH_LIB_FOR(arch)	"${sitearchdir}"
 % end
-% if C["vendordir"] == "no"
+% if !C["vendordir"] || C["vendordir"] == "no"
 #define NO_RUBY_VENDOR_LIB		1
 % else
 #define RUBY_VENDOR_LIB 		"${vendordir}"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]