1 From e943a89efd63dcfb80a0ab8d9a4db37f523f508e Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
3 Date: Fri, 8 Feb 2013 22:48:41 +0100
4 Subject: [PATCH] Prevent duplicated paths when empty version string is
9 version.c | 10 ++++++++++
10 2 files changed, 13 insertions(+)
12 diff --git a/configure.in b/configure.in
13 index 5850bbf..7604bb8 100644
16 @@ -3367,6 +3367,9 @@ unexpand_shvar exec_prefix prefix
17 if test ${RUBY_LIB_VERSION_STYLE+set}; then
18 AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE !<verconf>!)
20 + if test "x${ruby_version}" = 'x'; then
21 + AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
23 AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION] !<verconf>!)
25 AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, ${RUBY_EXEC_PREFIX})
26 diff --git a/version.c b/version.c
27 index 282960d..54c4513 100644
31 #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
34 +#ifdef RUBY_LIB_VERSION_BLANK
35 +#define RUBY_LIB RUBY_LIB_PREFIX
36 +#define RUBY_SITE_LIB2 RUBY_SITE_LIB
37 +#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB
39 #define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION
40 #define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION
41 #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION
43 #ifndef RUBY_ARCH_LIB_FOR
44 #define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch
46 @@ -77,8 +83,10 @@ const char ruby_initial_load_paths[] =
47 RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
49 RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
50 +#ifndef RUBY_LIB_VERSION_BLANK
55 #ifndef NO_RUBY_VENDOR_LIB
57 @@ -86,8 +94,10 @@ const char ruby_initial_load_paths[] =
58 RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
60 RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
61 +#ifndef RUBY_LIB_VERSION_BLANK