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 b7af385..025c022 100644 (file)
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -20,28 +20,36 @@ version="${perl_revision}.${perl_version}.${perl_subversion}"
 
 # BSD paths
 case "$prefix" in
-  ''|'/usr')
-       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
+'')    # 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
        ;;