Mac OS X hints dance continues. Now drop any special

installation directory mangling.  In other words, if
you want to overwrite the system perl, you really need
to find out how to do that.

p4raw-id: //depot/perl@20352

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 3a5d018..1db4365 100644 (file)
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -5,46 +5,9 @@
 
 ##
 # Paths
-##
-
-# 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='/';
-       # 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}";
-       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
+#
+# Since Perl 5.8.1: No more special prefix games, no special handling of /usr.
+#
 
 ##
 # Tool chain settings