From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 22 Oct 2001 21:17:39 +0000 (+0000)
Subject: Integrate changes #12580 and #12581 from macperl;
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=03765510f928d3bbc2f4c80d6607359655bee2bf;p=p5sagit%2Fp5-mst-13.2.git

Integrate changes #12580 and #12581 from macperl;

Fix path construction.

(Copyright) Nit.

p4raw-link: @12580 on //depot/maint-5.6/macperl: b2884604d5d1f2307ba4e8645e11489721ebb1bf

p4raw-id: //depot/perl@12593
p4raw-integrated: from //depot/maint-5.6/macperl@12592 'ignore' perl.c
	(@12324..) 'merge in' ext/DynaLoader/DynaLoader_pm.PL
	(@11007..)
---

diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index fa2ec0e..68cf145 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -246,8 +246,8 @@ sub bootstrap {
 	chop($_ = VMS::Filespec::unixpath($_)) if $Is_VMS;
 	my $dir;
 	if ($Is_MacOS) {
-	    chop $_  if /:$/;
-	    $dir = "$_:auto:$modpname";
+	    $_ .= ":"  unless /:$/;
+	    $dir = "${_}auto:$modpname";
 	} else {
 	    $dir = "$_/auto/$modpname";
 	}
diff --git a/perl.c b/perl.c
index ee2dd2f..7192122 100644
--- a/perl.c
+++ b/perl.c
@@ -2413,7 +2413,8 @@ Perl_moreswitches(pTHX_ char *s)
 		      "\n\nCopyright 1987-2001, Larry Wall\n");
 #ifdef MACOS_TRADITIONAL
 	PerlIO_printf(PerlIO_stdout(),
-		      "\nMac OS port Copyright (c) 1991-2001, Matthias Neeracher\n");
+		      "\nMac OS port Copyright 1991-2001, Matthias Neeracher;\n"
+		      "maintained by Chris Nandor\n");
 #endif
 #ifdef MSDOS
 	PerlIO_printf(PerlIO_stdout(),