|
 |
41d5ec4 |
From 1e109d1a0265dfdde2324a6a97e4225eb4343efc Mon Sep 17 00:00:00 2001
|
|
|
9e99bbc |
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
|
9e99bbc |
Date: Fri, 8 Feb 2013 22:48:41 +0100
|
|
|
9e99bbc |
Subject: [PATCH] Prevent duplicated paths when empty version string is
|
|
|
9e99bbc |
configured.
|
|
|
9e99bbc |
|
|
|
9e99bbc |
---
|
|
|
9e99bbc |
configure.in | 3 +++
|
|
|
9e99bbc |
version.c | 10 ++++++++++
|
|
|
9e99bbc |
2 files changed, 13 insertions(+)
|
|
|
9e99bbc |
|
|
|
9e99bbc |
diff --git a/configure.in b/configure.in
|
|
|
41d5ec4 |
index e83cfb4..d6af000 100644
|
|
|
9e99bbc |
--- a/configure.in
|
|
|
9e99bbc |
+++ b/configure.in
|
|
|
41d5ec4 |
@@ -3308,6 +3308,9 @@ shvar_to_cpp RIDIR "${ridir}"
|
|
|
9e99bbc |
if test ${RUBY_LIB_VERSION_STYLE+set}; then
|
|
|
9e99bbc |
AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE !<verconf>!)
|
|
|
9e99bbc |
else
|
|
|
9e99bbc |
+ if test "x${ruby_version}" = 'x'; then
|
|
|
9e99bbc |
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
|
|
|
9e99bbc |
+ fi
|
|
|
9e99bbc |
AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION] !<verconf>!)
|
|
|
9e99bbc |
fi
|
|
|
9e99bbc |
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, ${RUBY_EXEC_PREFIX})
|
|
|
9e99bbc |
diff --git a/version.c b/version.c
|
|
|
41d5ec4 |
index 6ba6453..c78f609 100644
|
|
|
9e99bbc |
--- a/version.c
|
|
|
9e99bbc |
+++ b/version.c
|
|
|
9e99bbc |
@@ -39,9 +39,15 @@
|
|
|
9e99bbc |
#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
|
|
|
9e99bbc |
#endif
|
|
|
9e99bbc |
|
|
|
9e99bbc |
+#ifdef RUBY_LIB_VERSION_BLANK
|
|
|
9e99bbc |
+#define RUBY_LIB RUBY_LIB_PREFIX
|
|
|
9e99bbc |
+#define RUBY_SITE_LIB2 RUBY_SITE_LIB
|
|
|
9e99bbc |
+#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB
|
|
|
9e99bbc |
+#else
|
|
|
9e99bbc |
#define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION
|
|
|
9e99bbc |
#define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION
|
|
|
9e99bbc |
#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION
|
|
|
9e99bbc |
+#endif
|
|
|
9e99bbc |
#ifndef RUBY_ARCH_LIB_FOR
|
|
|
9e99bbc |
#define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch
|
|
|
9e99bbc |
#endif
|
|
|
41d5ec4 |
@@ -79,8 +85,10 @@ const char ruby_initial_load_paths[] =
|
|
|
9e99bbc |
RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
|
9e99bbc |
#endif
|
|
|
9e99bbc |
RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
|
9e99bbc |
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
|
9e99bbc |
RUBY_SITE_LIB "\0"
|
|
|
9e99bbc |
#endif
|
|
|
9e99bbc |
+#endif
|
|
|
9e99bbc |
|
|
|
9e99bbc |
#ifndef NO_RUBY_VENDOR_LIB
|
|
|
9e99bbc |
RUBY_VENDOR_LIB2 "\0"
|
|
|
41d5ec4 |
@@ -88,8 +96,10 @@ const char ruby_initial_load_paths[] =
|
|
|
9e99bbc |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
|
9e99bbc |
#endif
|
|
|
9e99bbc |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
|
9e99bbc |
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
|
9e99bbc |
RUBY_VENDOR_LIB "\0"
|
|
|
9e99bbc |
#endif
|
|
|
9e99bbc |
+#endif
|
|
|
9e99bbc |
|
|
|
9e99bbc |
RUBY_LIB "\0"
|
|
|
9e99bbc |
#ifdef RUBY_THINARCH
|
|
|
9e99bbc |
--
|
|
|
41d5ec4 |
1.8.1.2
|
|
|
9e99bbc |
|