1 diff -urN perl-5.10.0.org/perl.c perl-5.10.0/perl.c
2 --- perl-5.10.0.org/perl.c 2007-12-18 11:47:08.000000000 +0100
3 +++ perl-5.10.0/perl.c 2008-01-09 14:12:15.921155066 +0100
5 incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
9 - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
11 -#ifdef MACOS_TRADITIONAL
14 - SV * privdir = newSV(0);
15 - char * macperl = PerlEnv_getenv("MACPERL");
20 - Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
21 - if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
22 - incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
23 - Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
24 - if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
25 - incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
27 - SvREFCNT_dec(privdir);
30 - incpush(":", FALSE, FALSE, TRUE, FALSE);
33 -# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
36 - incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
38 - incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
42 /* sitearch is always relative to sitelib on Windows for
43 * DLL-based path intuition to work correctly */
46 #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
47 /* Search for version-specific dirs below here */
48 - incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
49 + /* incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); */
52 #ifdef PERL_VENDORARCH_EXP
53 @@ -4825,7 +4792,40 @@
56 #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
57 - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
58 +/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); */
62 + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
64 +#ifdef MACOS_TRADITIONAL
67 + SV * privdir = NEWSV(55, 0);
68 + char * macperl = PerlEnv_getenv("MACPERL");
73 + Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
74 + if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
75 + incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
76 + Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
77 + if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
78 + incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
80 + SvREFCNT_dec(privdir);
83 + incpush(":", FALSE, FALSE, TRUE, FALSE);
86 +# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
89 + incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
91 + incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
94 #ifdef PERL_OTHERLIBDIRS