cleanup-non-versioned-paths.patch

Vit Ondruch, 02/09/2013 08:23 AM

Download (2.52 KB)

View differences:

configure.in
3265 3265
if test ${RUBY_LIB_VERSION_STYLE+set}; then
3266 3266
    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE !<verconf>!)
3267 3267
else
3268
    if test "x${ruby_version}" = 'x'; then
3269
        AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
3270
    fi
3268 3271
    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION] !<verconf>!)
3269 3272
fi
3270 3273
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, ${RUBY_EXEC_PREFIX})
version.c
77 77
    RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
78 78
#endif
79 79
    RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
80
#ifndef RUBY_LIB_VERSION_BLANK
80 81
    RUBY_SITE_LIB "\0"
81 82
#endif
83
#endif
82 84

  
83 85
#ifndef NO_RUBY_VENDOR_LIB
84 86
    RUBY_VENDOR_LIB2 "\0"
......
86 88
    RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
87 89
#endif
88 90
    RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
91
#ifndef RUBY_LIB_VERSION_BLANK
89 92
    RUBY_VENDOR_LIB "\0"
90 93
#endif
94
#endif
91 95

  
92 96
    RUBY_LIB "\0"
93 97
#ifdef RUBY_THINARCH
94
- 
version.c
39 39
#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
40 40
#endif
41 41

  
42
#ifdef RUBY_LIB_VERSION_BLANK
43
#define RUBY_LIB                    RUBY_LIB_PREFIX
44
#define RUBY_SITE_LIB2              RUBY_SITE_LIB
45
#define RUBY_VENDOR_LIB2            RUBY_VENDOR_LIB
46
#else
42 47
#define RUBY_LIB                    RUBY_LIB_PREFIX  "/"RUBY_LIB_VERSION
43 48
#define RUBY_SITE_LIB2              RUBY_SITE_LIB    "/"RUBY_LIB_VERSION
44 49
#define RUBY_VENDOR_LIB2            RUBY_VENDOR_LIB  "/"RUBY_LIB_VERSION
50
#endif
45 51
#ifndef RUBY_ARCH_LIB_FOR
46 52
#define RUBY_ARCH_LIB_FOR(arch)        RUBY_LIB         "/"arch
47 53
#endif
48
-