+++ /dev/null
-diff --git a/perl.c b/perl.c
-index dfb549d..9b5dd4c 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4151,26 +4151,6 @@ S_init_perllib(pTHX)
- # endif
- #endif
-
--#ifdef ARCHLIB_EXP
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
--#endif
--
--#ifndef PRIVLIB_EXP
--# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
--#endif
--
--#if defined(WIN32)
-- s = win32_get_privlib(PERL_FS_VERSION, &len);
-- if (s)
-- incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
--#else
--# ifdef NETWARE
-- S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
--# else
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
--# endif
--#endif
--
- #ifdef PERL_OTHERLIBDIRS
- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
- INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR
-@@ -4216,15 +4196,35 @@ S_init_perllib(pTHX)
-
- #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
- /* Search for version-specific dirs below here */
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
-- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
-+/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
-+ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
- #endif
-
-
- #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST)
- /* Search for version-specific dirs below here */
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
-- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
-+/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
-+ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
-+#endif
-+
-+#ifdef ARCHLIB_EXP
-+ S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
-+#endif
-+
-+#ifndef PRIVLIB_EXP
-+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-+#endif
-+
-+#if defined(WIN32)
-+ s = win32_get_privlib(PERL_FS_VERSION, &len);
-+ if (s)
-+ incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
-+#else
-+# ifdef NETWARE
-+ S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
-+# else
-+ S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
-+# endif
- #endif
-
- #ifdef PERL_OTHERLIBDIRS