| 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 |
| 5 |
configured. |
| 6 |
|
| 7 |
--- |
| 8 |
configure.in | 3 +++ |
| 9 |
version.c | 10 ++++++++++ |
| 10 |
2 files changed, 13 insertions(+) |
| 11 |
|
| 12 |
diff --git a/configure.in b/configure.in |
| 13 |
index 5850bbf..7604bb8 100644 |
| 14 |
--- a/configure.in |
| 15 |
+++ b/configure.in |
| 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>!) |
| 19 |
else |
| 20 |
+ if test "x${ruby_version}" = 'x'; then |
| 21 |
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1) |
| 22 |
+ fi |
| 23 |
AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION] !<verconf>!) |
| 24 |
fi |
| 25 |
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, ${RUBY_EXEC_PREFIX}) |
| 26 |
diff --git a/version.c b/version.c |
| 27 |
index 282960d..54c4513 100644 |
| 28 |
--- a/version.c |
| 29 |
+++ b/version.c |
| 30 |
@@ -39,9 +39,15 @@ |
| 31 |
#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" |
| 32 |
#endif |
| 33 |
|
| 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 |
| 38 |
+#else |
| 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 |
| 42 |
+#endif |
| 43 |
#ifndef RUBY_ARCH_LIB_FOR |
| 44 |
#define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch |
| 45 |
#endif |
| 46 |
@@ -77,8 +83,10 @@ const char ruby_initial_load_paths[] = |
| 47 |
RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0" |
| 48 |
#endif |
| 49 |
RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" |
| 50 |
+#ifndef RUBY_LIB_VERSION_BLANK |
| 51 |
RUBY_SITE_LIB "\0" |
| 52 |
#endif |
| 53 |
+#endif |
| 54 |
|
| 55 |
#ifndef NO_RUBY_VENDOR_LIB |
| 56 |
RUBY_VENDOR_LIB2 "\0" |
| 57 |
@@ -86,8 +94,10 @@ const char ruby_initial_load_paths[] = |
| 58 |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0" |
| 59 |
#endif |
| 60 |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" |
| 61 |
+#ifndef RUBY_LIB_VERSION_BLANK |
| 62 |
RUBY_VENDOR_LIB "\0" |
| 63 |
#endif |
| 64 |
+#endif |
| 65 |
|
| 66 |
RUBY_LIB "\0" |
| 67 |
#ifdef RUBY_THINARCH |
| 68 |
-- |
| 69 |
1.8.1.2 |
| 70 |
|
Parent Directory
| 
Revision Log