From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 30 Jul 2003 17:09:59 +0000 (+0000)
Subject: This is getting comical.  (Practical tip: never ask
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6fd181510e4504d1f2336871d1c793d547feac60;p=p5sagit%2Fp5-mst-13.2.git

This is getting comical.  (Practical tip: never ask
for opinions from one than one person at one time.)
Now back to -Dprefix='/usr' replacing the system Perl,
but don't use the Apple internal DSTROOT.

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

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 1db4365..0035792 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -5,9 +5,45 @@
 
 ##
 # Paths
-#
-# Since Perl 5.8.1: No more special prefix games, no special handling of /usr.
-#
+##
+
+# Configure hasn't figured out the version number yet.  Bummer.
+perl_revision=`awk '/define[ 	]+PERL_REVISION/ {print $3}' $src/patchlevel.h`
+perl_version=`awk '/define[ 	]+PERL_VERSION/ {print $3}' $src/patchlevel.h`
+perl_subversion=`awk '/define[ 	]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h`
+version="${perl_revision}.${perl_version}.${perl_subversion}"
+
+# This was previously used in all but causes three cases
+# (no -Ddprefix=, -Dprefix=/usr, -Dprefix=/some/thing/else)
+# but that caused too much grief.
+# vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
+
+# BSD paths
+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='/';
+	installprefix='/';
+	bin='/usr/bin';
+	sitebin='/usr/bin';
+	installusrbinperl='define'; # You knew what you were doing.
+	privlib="/System/Library/Perl/${version}";
+	sitelib="/Library/Perl/${version}";
+	vendorprefix='/';
+	usevendorprefix='define';
+	vendorbin='/usr/bin';
+	vendorscript='/usr/bin';
+	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, use Configure defaults
+	;;
+esac
 
 ##
 # Tool chain settings