$NetBSD: patch-ah,v 1.8 2004/12/29 19:41:25 jlam Exp $ --- perl.c.orig 2004-11-23 10:16:56.000000000 -0500 +++ perl.c @@ -4314,12 +4314,33 @@ S_init_perllib(pTHX) } /* Use the ~-expanded versions of APPLLIB (undocumented), - ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB + SITEARCH SITELIB ARCHLIB PRIVLIB VENDORARCH and VENDORLIB */ #ifdef APPLLIB_EXP incpush(APPLLIB_EXP, TRUE, 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); +# endif +#endif + +#ifdef SITELIB_EXP +# if defined(WIN32) + /* this picks up sitearch as well */ + incpush(SITELIB_EXP, TRUE, FALSE, TRUE); +# else + incpush(SITELIB_EXP, FALSE, FALSE, TRUE); +# endif +#endif + +#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ + incpush(SITELIB_STEM, FALSE, TRUE, TRUE); +#endif + #ifdef ARCHLIB_EXP incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); #endif @@ -4353,27 +4374,6 @@ S_init_perllib(pTHX) incpush(PRIVLIB_EXP, FALSE, FALSE, 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); -# endif -#endif - -#ifdef SITELIB_EXP -# if defined(WIN32) - /* this picks up sitearch as well */ - incpush(SITELIB_EXP, TRUE, FALSE, TRUE); -# else - incpush(SITELIB_EXP, FALSE, FALSE, TRUE); -# endif -#endif - -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ - incpush(SITELIB_STEM, FALSE, TRUE, TRUE); -#endif - #ifdef PERL_VENDORARCH_EXP /* vendorarch is always relative to vendorlib on Windows for * DLL-based path intuition to work correctly */