From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 30 Jul 2003 08:26:47 +0000 (+0000)
Subject: Mac OS X: tweak once again the installation directories.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bd242a2565bd18883fdf37362d277445b988f296;p=p5sagit%2Fp5-mst-13.2.git

Mac OS X: tweak once again the installation directories.

p4raw-id: //depot/perl@20333
---

diff --git a/hints/darwin.sh b/hints/darwin.sh
index fe8420f..b7af385 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -21,16 +21,29 @@ version="${perl_revision}.${perl_version}.${perl_subversion}"
 # BSD paths
 case "$prefix" in
   ''|'/usr')
-	# Default install; use non-system directories
-	prefix='/usr/local'; # Built-in perl uses /usr
-	siteprefix='/usr/local';
-	# Where to put modules.
-	sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
+	case "$prefix" in
+	'')	# Default install; use non-system directories
+		prefix='/usr/local';
+		siteprefix='/usr/local';
+		;;
+	'/usr')	# We are building/replacing the built-in perl
+		prefix=/;
+		siteprefix='/usr/local';
+		# The DSTROOT is used by the Apple build system.
+		installprefix="${DSTROOT}/";
+		bin='/usr/bin';
+		sitebin='/usr/bin';
+		installusrbinperl='define'; # You knew what you were doing.
+		privlib="/System/Library/Perl/${version}";
+		sitelib="/Library/Perl/${version}";
+		;;
+	esac
+	vendorlib="/Network/Library/Perl/${version}";
 	# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
 	man1dir='/usr/share/man/man1';
 	man3dir='/usr/share/man/man3';
 	;;
-  *)	# Anything else; use non-system directories
+  *)	# Anything else; use non-system directories, use Configure defaults
 	;;
 esac