summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-12-24 14:26:43 +0100
committerNicholas Clark <nick@ccl4.org>2012-01-02 12:18:53 +0100
commit8473bff152d23bc1d94791dc06c4164c47e6be60 (patch)
treecbafc1fc10bf2fcfdfe9dd872c90abd81a859365
parent3a548b368f8077e458c567bba559d5cf3fac9cbe (diff)
downloadperl-8473bff152d23bc1d94791dc06c4164c47e6be60.tar.gz
In installperl, initialise $do_install{arch,priv}lib at their declarations.
Also, add an editor block.
-rwxr-xr-xinstallperl15
1 files changed, 10 insertions, 5 deletions
diff --git a/installperl b/installperl
index 7b122a0e00..a6bd023bd1 100755
--- a/installperl
+++ b/installperl
@@ -341,8 +341,10 @@ else {
# Install library files.
-my ($do_installarchlib, $do_installprivlib) = (0, 0);
+my $do_installarchlib = !samepath($installarchlib, 'lib');
+my $do_installprivlib = !samepath($installprivlib, 'lib');
my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver;
+$do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
mkpath($installprivlib, $opts{verbose}, 0777);
mkpath($installarchlib, $opts{verbose}, 0777);
@@ -350,10 +352,6 @@ mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
if (chdir "lib") {
- $do_installarchlib = ! samepath($installarchlib, '.');
- $do_installprivlib = ! samepath($installprivlib, '.');
- $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
-
if ($do_installarchlib || $do_installprivlib) {
find(\&installlib, '.');
}
@@ -866,3 +864,10 @@ sub strip
}
}
}
+
+# Local variables:
+# cperl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
+#
+# ex: set ts=8 sts=4 sw=4 et: