--- ./perl.c.tv2 2007-11-26 18:27:19.000000000 +0100 +++ ./perl.c 2007-11-26 18:28:13.000000000 +0100 @@ -4784,6 +4784,39 @@ S_init_perllib(pTHX) #endif /* VMS */ } +#ifdef SITEARCH_EXP + /* sitearch is always relative to sitelib on Windows for + * DLL-based path intuition to work correctly */ +# if !defined(WIN32) + incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + +#ifdef SITELIB_EXP +# if defined(WIN32) + /* this picks up sitearch as well */ + incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); +# else + incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + +#ifdef PERL_VENDORARCH_EXP + /* vendorarch is always relative to vendorlib on Windows for + * DLL-based path intuition to work correctly */ +# if !defined(WIN32) + incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + +#ifdef PERL_VENDORLIB_EXP +# if defined(WIN32) + incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE); /* this picks up vendorarch as well */ +# else + incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + /* Use the ~-expanded versions of APPLLIB (undocumented), ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB */ @@ -4824,44 +4857,11 @@ S_init_perllib(pTHX) incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); #endif -#ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -# if !defined(WIN32) - incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - -#ifdef SITELIB_EXP -# if defined(WIN32) - /* this picks up sitearch as well */ - incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); -# else - incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) /* Search for version-specific dirs below here */ incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); #endif -#ifdef PERL_VENDORARCH_EXP - /* vendorarch is always relative to vendorlib on Windows for - * DLL-based path intuition to work correctly */ -# if !defined(WIN32) - incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - -#ifdef PERL_VENDORLIB_EXP -# if defined(WIN32) - incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE); /* this picks up vendorarch as well */ -# else - incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); #endif