summaryrefslogtreecommitdiff
path: root/hints/darwin.sh
diff options
context:
space:
mode:
authorTony Cook <tony@develop-help.com>2016-06-15 15:02:48 +1000
committerAaron Crane <arc@cpan.org>2016-11-12 13:30:09 +0100
commit67bdb7ae864de5b39b1d10dd96399b5163385d3c (patch)
treedd8fd2acd0192bd0afda89af0595557b26365aa3 /hints/darwin.sh
parent56ed632cd2df6011bd67673f4f87d04f29bfaeb1 (diff)
downloadperl-67bdb7ae864de5b39b1d10dd96399b5163385d3c.tar.gz
(perl #128295) don't treat -Dprefix=/usr as special
but instead require an extra option -Ddarwin_distribution to produce the same results.
Diffstat (limited to 'hints/darwin.sh')
-rw-r--r--hints/darwin.sh15
1 files changed, 4 insertions, 11 deletions
diff --git a/hints/darwin.sh b/hints/darwin.sh
index 40395de80d..690fe4e3ce 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -35,15 +35,10 @@ esac
# 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='/';
+case "$darwin_distribution" in
+$define) # We are building/replacing the built-in perl
+ prefix='/usr';
+ installprefix='/usr';
bin='/usr/bin';
siteprefix='/usr/local';
# We don't want /usr/bin/HEAD issues.
@@ -68,8 +63,6 @@ case "$prefix" in
siteman1dir='/usr/local/share/man/man1';
siteman3dir='/usr/local/share/man/man3';
;;
- *) # Anything else; use non-system directories, use Configure defaults
- ;;
esac
##