| --- perl.c.orig 2006-01-24 09:57:33.000000000 -0500 |
| +++ perl.c 2006-01-24 10:03:15.000000000 -0500 |
| @@ -4777,9 +4777,9 @@ S_init_perllib(pTHX) |
| incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); |
| #endif |
| |
| -#ifdef ARCHLIB_EXP |
| - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); |
| -#endif |
| + /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ |
| + incpush("/etc/perl", FALSE, FALSE, TRUE); |
| + |
| #ifdef MACOS_TRADITIONAL |
| { |
| Stat_t tmpstatbuf; |
| @@ -4806,51 +4806,58 @@ S_init_perllib(pTHX) |
| #endif |
| #if defined(WIN32) |
| incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); |
| -#else |
| - incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); |
| #endif |
| |
| -#ifdef SITEARCH_EXP |
| - /* sitearch is always relative to sitelib on Windows for |
| +#ifdef PERL_VENDORARCH_EXP |
| + /* vendorarch is always relative to vendorlib on Windows for |
| * DLL-based path intuition to work correctly */ |
| # if !defined(WIN32) |
| - incpush(SITEARCH_EXP, FALSE, FALSE, TRUE); |
| + incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE); |
| # endif |
| #endif |
| |
| -#ifdef SITELIB_EXP |
| +#ifdef PERL_VENDORLIB_EXP |
| # if defined(WIN32) |
| - /* this picks up sitearch as well */ |
| - incpush(SITELIB_EXP, TRUE, FALSE, TRUE); |
| + incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE); /* this picks up vendorarch as well */ |
| # else |
| - incpush(SITELIB_EXP, FALSE, FALSE, TRUE); |
| + incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE); |
| # endif |
| #endif |
| |
| -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ |
| - incpush(SITELIB_STEM, FALSE, TRUE, TRUE); |
| +#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ |
| + incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); |
| #endif |
| |
| -#ifdef PERL_VENDORARCH_EXP |
| - /* vendorarch is always relative to vendorlib on Windows for |
| +#ifdef SITEARCH_EXP |
| + /* sitearch is always relative to sitelib on Windows for |
| * DLL-based path intuition to work correctly */ |
| # if !defined(WIN32) |
| - incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE); |
| + incpush(SITEARCH_EXP, FALSE, FALSE, TRUE); |
| # endif |
| #endif |
| |
| -#ifdef PERL_VENDORLIB_EXP |
| +#ifdef SITELIB_EXP |
| # if defined(WIN32) |
| - incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE); /* this picks up vendorarch as well */ |
| + /* this picks up sitearch as well */ |
| + incpush(SITELIB_EXP, TRUE, FALSE, TRUE); |
| # else |
| - incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE); |
| + incpush(SITELIB_EXP, FALSE, FALSE, TRUE); |
| # endif |
| #endif |
| |
| -#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ |
| - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); |
| +#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ |
| + incpush(SITELIB_STEM, FALSE, TRUE, TRUE); |
| #endif |
| |
| + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); |
| + incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); |
| + |
| + /* Non-versioned site directory for local modules and for |
| + compatability with the previous packages' site dirs */ |
| + |
| + incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE); |
| + |
| + |
| #ifdef PERL_OTHERLIBDIRS |
| incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); |
| #endif |
