summaryrefslogtreecommitdiff
path: root/installperl
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1998-01-13 02:46:53 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-01-13 02:46:53 +0000
commitd07c2202867c84a305417e42e522ca39d055c62a (patch)
tree61abe56eb09e388c565e410cebc8a0d7778ffd11 /installperl
parent2fd1c6b8c969281de42d3830c930f0cea98c16de (diff)
downloadperl-d07c2202867c84a305417e42e522ca39d055c62a.tar.gz
[win32] various tweaks to build support (NOTE: meant for 5.004_57)
- build and install x2p - fix installperl warnings on win32 - `make install` now does puts the archlibs in right places - makefiles don't default to USE_THREADS anymore - sync config.{b,g,v}c - sync makefile.mk -> Makefile p4raw-id: //depot/win32/perl@416
Diffstat (limited to 'installperl')
-rwxr-xr-xinstallperl8
1 files changed, 5 insertions, 3 deletions
diff --git a/installperl b/installperl
index ee00cd16a5..150b334f8c 100755
--- a/installperl
+++ b/installperl
@@ -2,6 +2,7 @@
BEGIN {
require 5.004;
+ chdir '..' if !-d 'lib' and -d '..\lib';
@INC = 'lib';
$ENV{PERL5LIB} = 'lib';
}
@@ -87,8 +88,9 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
-x 'perl' . $exe_ext || die "perl isn't executable!\n";
-x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
--x 't/TEST' || warn "WARNING: You've never run 'make test'!!!",
- " (Installing anyway.)\n";
+-x 't/TEST' || $^O eq 'MSWin32'
+ || warn "WARNING: You've never run 'make test'!!!",
+ " (Installing anyway.)\n";
if ($^O eq 'MSWin32') {
@@ -160,7 +162,7 @@ foreach $file (@corefiles) {
$mainperl_is_instperl = 0;
-if (!$versiononly && !$nonono && -t STDIN && -t STDERR
+if (!$versiononly && !$nonono && $^O ne 'MSWin32' && -t STDIN && -t STDERR
&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
local($usrbinperl) = "$mainperldir/perl$exe_ext";
local($instperl) = "$installbin/perl$exe_ext";