projects / packages / perl.git / blame
| Commit | Line | Data |
|---|---|---|
| 253f30cb | 1 | diff --git a/perl.c b/perl.c |
| 2 | index dfb549d..9b5dd4c 100644 | |
| 3 | --- a/perl.c | |
| 4 | +++ b/perl.c | |
| 5 | @@ -4151,26 +4151,6 @@ S_init_perllib(pTHX) | |
| 6 | # endif | |
| 642838fa | 7 | #endif |
| 3677dc59 | 8 | |
| 9 | -#ifdef ARCHLIB_EXP | |
| 253f30cb | 10 | - S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE); |
| 3677dc59 | 11 | -#endif |
| 253f30cb | 12 | - |
| 642838fa | 13 | -#ifndef PRIVLIB_EXP |
| 14 | -# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" | |
| 15 | -#endif | |
| 253f30cb | 16 | - |
| 642838fa | 17 | -#if defined(WIN32) |
| 253f30cb | 18 | - s = win32_get_privlib(PERL_FS_VERSION, &len); |
| 19 | - if (s) | |
| 20 | - incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); | |
| 642838fa | 21 | -#else |
| 253f30cb | 22 | -# ifdef NETWARE |
| 23 | - S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE); | |
| 24 | -# else | |
| 25 | - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE); | |
| 26 | -# endif | |
| 642838fa | 27 | -#endif |
| 3677dc59 | 28 | - |
| 253f30cb | 29 | #ifdef PERL_OTHERLIBDIRS |
| 30 | S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), | |
| 31 | INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR | |
| 32 | @@ -4216,15 +4196,35 @@ S_init_perllib(pTHX) | |
| 642838fa | 33 | |
| b84f5e28 AM |
34 | #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) |
| 35 | /* Search for version-specific dirs below here */ | |
| 253f30cb | 36 | - S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), |
| 37 | - INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); | |
| 38 | +/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), | |
| 39 | + INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */ | |
| 642838fa | 40 | #endif |
| 41 | ||
| 642838fa | 42 | |
| 253f30cb | 43 | #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST) |
| 44 | /* Search for version-specific dirs below here */ | |
| 45 | - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM), | |
| 46 | - INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); | |
| 47 | +/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM), | |
| 48 | + INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */ | |
| 642838fa | 49 | +#endif |
| 50 | + | |
| 3677dc59 | 51 | +#ifdef ARCHLIB_EXP |
| 253f30cb | 52 | + S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE); |
| 3677dc59 | 53 | +#endif |
| b84f5e28 | 54 | + |
| 642838fa | 55 | +#ifndef PRIVLIB_EXP |
| 56 | +# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" | |
| 57 | +#endif | |
| 253f30cb | 58 | + |
| 642838fa | 59 | +#if defined(WIN32) |
| 253f30cb | 60 | + s = win32_get_privlib(PERL_FS_VERSION, &len); |
| 61 | + if (s) | |
| 62 | + incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); | |
| 642838fa | 63 | +#else |
| 253f30cb | 64 | +# ifdef NETWARE |
| 65 | + S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE); | |
| 66 | +# else | |
| 67 | + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE); | |
| 68 | +# endif | |
| 642838fa | 69 | #endif |
| 70 | ||
| 71 | #ifdef PERL_OTHERLIBDIRS |