Ticket #12950: patch-perl.c.diff

File patch-perl.c.diff, 2.0 KB (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 16 years ago)

  • perl.c

    old new  
    48764876    }
    48774877
    48784878/* Use the ~-expanded versions of APPLLIB (undocumented),
    4879     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
     4879         (old) ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
     4880    (macports) SITEARCH SITELIB ARCHLIB PRIVLIB VENDORARCH and VENDORLIB
    48804881*/
    48814882#ifdef APPLLIB_EXP
    48824883    incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
    48834884#endif
    48844885
     4886#ifdef SITEARCH_EXP
     4887    /* sitearch is always relative to sitelib on Windows for
     4888     * DLL-based path intuition to work correctly */
     4889#  if !defined(WIN32)
     4890    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
     4891#  endif
     4892#endif
     4893
     4894#ifdef SITELIB_EXP
     4895#  if defined(WIN32)
     4896    /* this picks up sitearch as well */
     4897    incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
     4898#  else
     4899    incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
     4900#  endif
     4901#endif
     4902
     4903#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
     4904    /* Search for version-specific dirs below here */
     4905    incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
     4906#endif
     4907
    48854908#ifdef ARCHLIB_EXP
    48864909    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
    48874910#endif
    … …  
    49154938    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
    49164939#endif
    49174940
    4918 #ifdef SITEARCH_EXP
    4919     /* sitearch is always relative to sitelib on Windows for
    4920      * DLL-based path intuition to work correctly */
    4921 #  if !defined(WIN32)
    4922     incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
    4923 #  endif
    4924 #endif
    4925 
    4926 #ifdef SITELIB_EXP
    4927 #  if defined(WIN32)
    4928     /* this picks up sitearch as well */
    4929     incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
    4930 #  else
    4931     incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
    4932 #  endif
    4933 #endif
    4934 
    4935 #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
    4936     /* Search for version-specific dirs below here */
    4937     incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
    4938 #endif
    4939 
    49404941#ifdef PERL_VENDORARCH_EXP
    49414942    /* vendorarch is always relative to vendorlib on Windows for
    49424943     * DLL-based path intuition to work correctly */