More for the *dir changes.

[p5sagit/p5-mst-13.2.git] / hints / darwin.sh

diff --git a/hints/darwin.sh b/hints/darwin.sh
index affa83c..025c022 100644 (file)
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -13,34 +13,48 @@ 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'; # Built-in perl uses /usr
-    siteprefix='/usr/local';
-    vendorprefix='/usr'; usevendorprefix='define';
-
-    # Where to put modules.
-    sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
-    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
-    ;;
-
-  '/usr')
-    # We are building/replacing the built-in perl
-    siteprefix='/usr/local';
-    vendorprefix='/usr/local'; usevendorprefix='define';
-
-    # Where to put modules.
-    sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
-    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
-    ;;
+'')    # 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';
+       siteprefix='/usr/local';
+       # We don't want /usr/bin/HEAD issues.
+       sitebin='/usr/local/bin';
+       sitescript='/usr/local/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';
+       # But users' installs shouldn't touch the system man pages.
+       # Transient obsoleted style.
+       siteman1='/usr/local/share/man/man1';
+       siteman3='/usr/local/share/man/man3';
+       # New style.
+       siteman1dir='/usr/local/share/man/man1';
+       siteman3dir='/usr/local/share/man/man3';
+       ;;
+  *)   # Anything else; use non-system directories, use Configure defaults
+       ;;
 esac
 
-# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
-man1dir="${prefix}/share/man/man1";
-man3dir="${prefix}/share/man/man3";
-
 ##
 # Tool chain settings
 ##