diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-03-06 05:21:26 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-03-06 05:21:26 +0000 |
| commit | 3b2903621aacf4b1cc9b9d99f9a25167b486b91f (patch) | |
| tree | cb98b98aaca0b2bcfca3e21129f44d7da30d5c02 | |
| parent | 65f190625df5c430dbe5dc68ccef865b33839973 (diff) | |
| download | perl-3b2903621aacf4b1cc9b9d99f9a25167b486b91f.tar.gz | |
the incpush()es weren't all quite right on Windows in change#5559
p4raw-link: @5559 on //depot/metaconfig: 7f16f79d81f7fcd9c63772c8cb730e8ba08247e6on //depot/cfgperl: 526fdc24ad2c51ba7f2a58c871a45d948bdfe8e3
p4raw-id: //depot/perl@5572
| -rw-r--r-- | perl.c | 26 |
1 files changed, 9 insertions, 17 deletions
@@ -3249,51 +3249,43 @@ S_init_perllib(pTHX) #endif #ifdef SITEARCH_EXP -# if defined(WIN32) - incpush(SITEARCH_EXP, TRUE); -# else + /* sitearch is always relative to sitelib on Windows for + * DLL-based path intuition to work correctly */ +# if !defined(WIN32) incpush(SITEARCH_EXP, FALSE); # endif #endif #ifdef SITELIB_EXP # if defined(WIN32) - incpush(SITELIB_EXP, TRUE); + incpush(SITELIB_EXP, TRUE); /* this picks up sitearch as well */ # else incpush(SITELIB_EXP, FALSE); # endif #endif #ifdef SITELIB_STEM /* Search for version-specific dirs below here */ -# if defined(WIN32) - /* XXX Win32 needs inc_version_list support */ -# else incpush(SITELIB_STEM, TRUE); -# endif #endif #ifdef PERL_VENDORARCH_EXP -# if defined(WIN32) - incpush(PERL_VENDORARCH_EXP, TRUE); -# else + /* vendorarch is always relative to sitelib on Windows for + * DLL-based path intuition to work correctly */ +# if !defined(WIN32) incpush(PERL_VENDORARCH_EXP, FALSE); # endif #endif #ifdef PERL_VENDORLIB_EXP # if defined(WIN32) - incpush(PERL_VENDORLIB_EXP, TRUE); + incpush(PERL_VENDORLIB_EXP, TRUE); /* this picks up vendorarch as well */ # else incpush(PERL_VENDORLIB_EXP, FALSE); # endif #endif #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ -# if defined(WIN32) - /* XXX Win32 needs inc_version_list support */ -# else incpush(PERL_VENDORLIB_STEM, TRUE); -# endif #endif if (!PL_tainting) @@ -3318,7 +3310,7 @@ S_incpush(pTHX_ char *p, int addsubdirs) { SV *subdir = Nullsv; - if (!p) + if (!p || !*p) return; if (addsubdirs) { |