This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
(perl #128295) don't treat -Dprefix=/usr as special
authorTony Cook <tony@develop-help.com>
Wed, 15 Jun 2016 05:02:48 +0000 (15:02 +1000)
committerAaron Crane <arc@cpan.org>
Sat, 12 Nov 2016 12:30:09 +0000 (13:30 +0100)
but instead require an extra option -Ddarwin_distribution to produce
the same results.

hints/darwin.sh

index 40395de..690fe4e 100644 (file)
@@ -35,15 +35,10 @@ esac
 # but that caused too much grief.
 # vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
 
 # 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.
        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';
        ;;
        siteman1dir='/usr/local/share/man/man1';
        siteman3dir='/usr/local/share/man/man3';
        ;;
-  *)   # Anything else; use non-system directories, use Configure defaults
-       ;;
 esac
 
 ##
 esac
 
 ##