difforig perl-5.10.0/perl.c

2008-02-08  Reini Urban <rurban@x-ray.at>

diff -ub perl-5.10.0/perl.c.orig perl-5.10.0/perl.c
--- perl-5.10.0/perl.c.orig	2007-12-18 10:47:08.000000000 +0000
+++ perl-5.10.0/perl.c	2008-02-08 17:15:49.259642000 +0000
@@ -4803,11 +4803,6 @@
 #  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 */
@@ -4824,12 +4819,17 @@
 #  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_VENDORLIB_STEM /* Search for version-specific dirs below here */
     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
 #endif
 
-#ifdef PERL_OTHERLIBDIRS
-    incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
+#ifdef PERL_OTHERLIBDIRS /* CYG PATCH: needs other archlib explicitly */
+    incpush(PERL_OTHERLIBDIRS, FALSE, FALSE, TRUE, FALSE);
 #endif
 
     if (!PL_tainting)