1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

verconf.h: fix for default prefix

Browse Source 
* configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for
  default prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-05-16 07:15:48 +00:00
parent f13a0a4dda
commit 49d37e6edc
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu May 16 16:15:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for
default prefix.
Thu May 16 13:12:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu May 16 13:12:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/verconf.h.in: generate verconf.h from the template and * template/verconf.h.in: generate verconf.h from the template and

19
configure.in
View File

@ -2831,18 +2831,19 @@ else
fi fi
AC_SUBST(setup) AC_SUBST(setup)
save_prefix="$prefix" if test x"${exec_prefix}" != xNONE; then
save_exec_prefix="$exec_prefix" RUBY_EXEC_PREFIX="$exec_prefix"
test x"$prefix" = xNONE && prefix=$ac_default_prefix elif test x"$prefix" != xNONE; then
test x"${exec_prefix}" = xNONE && exec_prefix="$prefix" RUBY_EXEC_PREFIX="$prefix"
pat=`echo "${exec_prefix}" | tr -c '\012' .`'\(.*\)' else
RUBY_EXEC_PREFIX=$ac_default_prefix
fi
pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
for var in bindir libdir; do for var in bindir libdir; do
eval val='"$'$var'"' 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"' eval $var='"$val"'
done done
prefix="$save_prefix"
exec_prefix="$save_exec_prefix"
BTESTRUBY='$(MINIRUBY)' BTESTRUBY='$(MINIRUBY)'
if test x"$cross_compiling" = xyes; then if test x"$cross_compiling" = xyes; then
@ -3566,8 +3567,6 @@ AC_ARG_WITH(vendorarchdir,
if test "${LOAD_RELATIVE+set}"; then if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX='' RUBY_EXEC_PREFIX=''
else
RUBY_EXEC_PREFIX="${exec_prefix}"
fi fi
AC_SUBST(RUBY_EXEC_PREFIX) AC_SUBST(RUBY_EXEC_PREFIX)

18
template/verconf.h.in
View File

@ -1,18 +1,19 @@
% require './rbconfig' % require './rbconfig'
% C = RbConfig::MAKEFILE_CONFIG % C = RbConfig::MAKEFILE_CONFIG.dup
% % def C.[](name) str = super and (str unless str.empty?); end
% verconf =
#define RUBY_BASE_NAME "${RUBY_BASE_NAME}" #define RUBY_BASE_NAME "${RUBY_BASE_NAME}"
#define RUBY_VERSION_NAME RUBY_BASE_NAME"-"RUBY_LIB_VERSION #define RUBY_VERSION_NAME RUBY_BASE_NAME"-"RUBY_LIB_VERSION
% if C["RUBY_LIB_VERSION_STYLE"] % if C["RUBY_LIB_VERSION_STYLE"]
#define RUBY_LIB_VERSION_STYLE ${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 % else
#define RUBY_LIB_VERSION ${RUBY_LIB_VERSION} #define RUBY_LIB_VERSION ${RUBY_LIB_VERSION}
% end % 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}" #define RUBY_LIB_PREFIX "${rubylibprefix}"
% unless C["sitearch"] == '$(arch)' % unless (sitearch = C["sitearch"]) == '$(arch)'
#define RUBY_SITEARCH "${sitearch}" #define RUBY_SITEARCH "<%=sitearch%>"
% end % end
#define RUBY_ARCH_PREFIX_FOR(arch) "${rubyarchprefix}" #define RUBY_ARCH_PREFIX_FOR(arch) "${rubyarchprefix}"
#define RUBY_SITEARCH_PREFIX_FOR(arch) "${rubysitearchprefix}" #define RUBY_SITEARCH_PREFIX_FOR(arch) "${rubysitearchprefix}"
@ -30,7 +31,7 @@
#define RUBY_VENDOR_LIB "${vendordir}" #define RUBY_VENDOR_LIB "${vendordir}"
#define RUBY_VENDOR_ARCH_LIB_FOR(arch) "${vendorarchdir}" #define RUBY_VENDOR_ARCH_LIB_FOR(arch) "${vendorarchdir}"
% end % end
% unless C["RUBY_SEARCH_PATH"] == "" % if C["RUBY_SEARCH_PATH"]
#define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}" #define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}"
% end % end
% %
@ -47,7 +48,8 @@
% R["rubyarchprefix"] = '"RUBY_ARCH_PREFIX_FOR(arch)"' % R["rubyarchprefix"] = '"RUBY_ARCH_PREFIX_FOR(arch)"'
% R["rubysitearchprefix"] = '"RUBY_SITEARCH_PREFIX_FOR(arch)"' % R["rubysitearchprefix"] = '"RUBY_SITEARCH_PREFIX_FOR(arch)"'
% R["exec_prefix"] = '"RUBY_EXEC_PREFIX"' % 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 % pre, name, repl = $1, $2, $3
% pat = %["#{name}"] % pat = %["#{name}"]
% c = C.merge(R.reject {|key, value| key == name or value.include?(pat)}) % c = C.merge(R.reject {|key, value| key == name or value.include?(pat)})