In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/67bdb7ae864de5b39b1d10dd96399b5163385d3c?hp=56ed632cd2df6011bd67673f4f87d04f29bfaeb1>

- Log -----------------------------------------------------------------
commit 67bdb7ae864de5b39b1d10dd96399b5163385d3c
Author: Tony Cook <[email protected]>
Date:   Wed Jun 15 15:02:48 2016 +1000

    (perl #128295) don't treat -Dprefix=/usr as special
    
    but instead require an extra option -Ddarwin_distribution to produce
    the same results.
-----------------------------------------------------------------------

Summary of changes:
 hints/darwin.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 40395de..690fe4e 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
 
 ##

--
Perl5 Master Repository

Reply via email to