ruby-changes:28730
From: nobu <ko1@a...>
Date: Thu, 16 May 2013 16:16:07 +0900 (JST)
Subject: [ruby-changes:28730] nobu:r40782 (trunk): verconf.h: fix for default prefix
nobu 2013-05-16 16:15:48 +0900 (Thu, 16 May 2013) New Revision: 40782 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40782 Log: verconf.h: fix for default prefix * configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for default prefix. Modified files: trunk/ChangeLog trunk/configure.in trunk/template/verconf.h.in Index: configure.in =================================================================== --- configure.in (revision 40781) +++ configure.in (revision 40782) @@ -2831,18 +2831,19 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L2831 fi AC_SUBST(setup) -save_prefix="$prefix" -save_exec_prefix="$exec_prefix" -test x"$prefix" = xNONE && prefix=$ac_default_prefix -test x"${exec_prefix}" = xNONE && exec_prefix="$prefix" -pat=`echo "${exec_prefix}" | tr -c '\012' .`'\(.*\)' +if test x"${exec_prefix}" != xNONE; then + RUBY_EXEC_PREFIX="$exec_prefix" +elif test x"$prefix" != xNONE; then + RUBY_EXEC_PREFIX="$prefix" +else + RUBY_EXEC_PREFIX=$ac_default_prefix +fi +pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)' for var in bindir libdir; do eval val='"$'$var'"' - AS_CASE(["$val"], ["${exec_prefix}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"]) + AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"]) eval $var='"$val"' done -prefix="$save_prefix" -exec_prefix="$save_exec_prefix" BTESTRUBY='$(MINIRUBY)' if test x"$cross_compiling" = xyes; then @@ -3566,8 +3567,6 @@ AC_ARG_WITH(vendorarchdir, https://github.com/ruby/ruby/blob/trunk/configure.in#L3567 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -else - RUBY_EXEC_PREFIX="${exec_prefix}" fi AC_SUBST(RUBY_EXEC_PREFIX) Index: ChangeLog =================================================================== --- ChangeLog (revision 40781) +++ ChangeLog (revision 40782) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Thu May 16 16:15:31 2013 Nobuyoshi Nakada <nobu@r...> + + * configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for + default prefix. + Thu May 16 13:12:27 2013 Nobuyoshi Nakada <nobu@r...> * template/verconf.h.in: generate verconf.h from the template and Index: template/verconf.h.in =================================================================== --- template/verconf.h.in (revision 40781) +++ template/verconf.h.in (revision 40782) @@ -1,18 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.in#L1 % require './rbconfig' -% C = RbConfig::MAKEFILE_CONFIG -% -% verconf = +% C = RbConfig::MAKEFILE_CONFIG.dup +% def C.[](name) str = super and (str unless str.empty?); end #define RUBY_BASE_NAME "${RUBY_BASE_NAME}" #define RUBY_VERSION_NAME RUBY_BASE_NAME"-"RUBY_LIB_VERSION % if C["RUBY_LIB_VERSION_STYLE"] #define RUBY_LIB_VERSION_STYLE ${RUBY_LIB_VERSION_STYLE} +% elsif !C["RUBY_LIB_VERSION"] +#define RUBY_LIB_VERSION_STYLE 3 /* full */ % else #define RUBY_LIB_VERSION ${RUBY_LIB_VERSION} % end -#define RUBY_EXEC_PREFIX "${RUBY_EXEC_PREFIX}" +#define RUBY_EXEC_PREFIX "<%='${RUBY_EXEC_PREFIX}' if C['RUBY_EXEC_PREFIX']%>" #define RUBY_LIB_PREFIX "${rubylibprefix}" -% unless C["sitearch"] == '$(arch)' -#define RUBY_SITEARCH "${sitearch}" +% unless (sitearch = C["sitearch"]) == '$(arch)' +#define RUBY_SITEARCH "<%=sitearch%>" % end #define RUBY_ARCH_PREFIX_FOR(arch) "${rubyarchprefix}" #define RUBY_SITEARCH_PREFIX_FOR(arch) "${rubysitearchprefix}" @@ -30,7 +31,7 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.in#L31 #define RUBY_VENDOR_LIB "${vendordir}" #define RUBY_VENDOR_ARCH_LIB_FOR(arch) "${vendorarchdir}" % end -% unless C["RUBY_SEARCH_PATH"] == "" +% if C["RUBY_SEARCH_PATH"] #define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}" % end % @@ -47,7 +48,8 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.in#L48 % R["rubyarchprefix"] = '"RUBY_ARCH_PREFIX_FOR(arch)"' % R["rubysitearchprefix"] = '"RUBY_SITEARCH_PREFIX_FOR(arch)"' % R["exec_prefix"] = '"RUBY_EXEC_PREFIX"' -% verconf.gsub!(/^(#define\s+(\S+)\s+)(.*)/) { +% R["prefix"] = '"RUBY_EXEC_PREFIX"' +% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) { % pre, name, repl = $1, $2, $3 % pat = %["#{name}"] % c = C.merge(R.reject {|key, value| key == name or value.include?(pat)}) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/