$NetBSD: patch-ah,v 1.5 2002/01/28 00:25:28 jlam Exp $ --- perl.c.orig Thu Mar 22 00:05:02 2001 +++ perl.c @@ -3408,12 +3408,32 @@ } /* 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); #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); +# endif +#endif + +#ifdef SITELIB_EXP +# if defined(WIN32) + incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ +# else + incpush(SITELIB_EXP, FALSE, FALSE); +# endif +#endif + +#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ + incpush(SITELIB_STEM, FALSE, TRUE); +#endif + #ifdef ARCHLIB_EXP incpush(ARCHLIB_EXP, FALSE, FALSE); #endif @@ -3445,26 +3465,6 @@ incpush(PRIVLIB_EXP, TRUE, FALSE); #else incpush(PRIVLIB_EXP, FALSE, FALSE); -#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); -# endif -#endif - -#ifdef SITELIB_EXP -# if defined(WIN32) - incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ -# else - incpush(SITELIB_EXP, FALSE, FALSE); -# endif -#endif - -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ - incpush(SITELIB_STEM, FALSE, TRUE); #endif #ifdef PERL_VENDORARCH_EXP