update local_patches entry for RC2

[perl5.git] / Policy_sh.SH

diff --git a/Policy_sh.SH b/Policy_sh.SH
index 133a9fa..0d9c1df 100644 (file)
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -32,6 +32,8 @@ esac
 # Installation prefixes.  Allow a Configure -D override.  You
 # may wish to reinstall perl under a different prefix, perhaps
 # in order to test a different configuration.
+# For an explanation of the installation directories, see the
+# INSTALL file section on "Installation Directories".
 case "\$prefix" in
 '') prefix='$prefix' ;;
 esac
@@ -59,8 +61,18 @@ esac
 #     this too is handled automatically by Configure based on
 #     $installprefix, so it isn't included here either.
 #
+# Note also that there are three broad hierarchies of installation 
+# directories, as discussed in the INSTALL file under 
+# "Installation Directories":
+#
+#  =item Directories for the perl distribution
+#
+#  =item Directories for site-specific add-on files
+#
+#  =item Directories for vendor-supplied add-on files
+#
 #  See Porting/Glossary for the definitions of these names, and see the
-#  INSTALL file for some examples.
+#  INSTALL file for further explanation and some examples.
 # 
 # In each case, if your previous value was the default, leave it commented
 # out.  That way, if you override prefix, all of these will be
@@ -74,8 +86,8 @@ esac
 
 for var in \
        bin scriptdir privlib archlib man1dir man3dir html1dir html3dir \
-       sitebin sitescriptdir sitelib sitearch \
-               siteman1dir siteman3dir sitehtml1dir sitehtml3dir \
+       sitebin sitescript sitelib sitearch \
+               siteman1 siteman3 sitehtml1 sitehtml3 \
        vendorbin vendorscript vendorlib vendorarch \
                vendorman1 vendorman3 vendorhtml1 vendorhtml3
 do
@@ -110,10 +122,9 @@ do
     html1dir)  dflt='' ;;
     htm31dir)  dflt='' ;;
 
-    # Site-specific add-ons.
+    # Directories for site-specific add-on files
     sitebin)   dflt=$siteprefix/bin ;;
-    # The scriptdir test is more complex, but this is probably usually ok.
-    sitescriptdir)
+    sitescript)
        if $test -d $siteprefix/script; then
            dflt=$siteprefix/script
        else
@@ -122,29 +133,27 @@ do
        ;;
     sitelib)
        case "$siteprefix" in
-       *perl*) dflt=$prefix/lib/site_perl ;;
-       *)      dflt=$prefix/lib/$package/site_perl ;;
+       *perl*) dflt=$prefix/lib/site_perl/$version ;;
+       *)      dflt=$prefix/lib/$package/site_perl/$version ;;
        esac
        ;;
-    sitearch)  dflt="$sitelib/$apiversion/$archname" ;;
+    sitearch)  dflt="$sitelib/$archname" ;;
 
-    siteman1dir)       dflt="$siteprefix/man/man1" ;;
-    siteman3dir)       dflt="$siteprefix/man/man3" ;;
+    siteman1)  dflt="$siteprefix/man/man1" ;;
+    siteman3)  dflt="$siteprefix/man/man3" ;;
     # We don't know what to do with these yet.
-    sitehtml1dir)      dflt='' ;;
+    sitehtml1) dflt='' ;;
     sitehtm31dir)      dflt='' ;;
     
-    # Vendor-specific add-ons.  These are all usually empty.
+    # Directories for vendor-supplied add-on files
+    # These are all usually empty.
     vendor*)
        if test X"$vendorprefix" = X""; then
            dflt=''
        else
            case "$var" in
            vendorbin)  dflt=$vendorprefix/bin ;;
-
-           # The scriptdir test is more complex, 
-           # but this is probably usually ok.
-           vendorscriptdir)
+           vendorscript)
                if $test -d $vendorprefix/script; then
                    dflt=$vendorprefix/script
                else
@@ -153,17 +162,17 @@ do
                ;;
            vendorlib)
                case "$vendorprefix" in
-               *perl*) dflt=$prefix/lib/vendor_perl ;;
-               *)      dflt=$prefix/lib/$package/vendor_perl ;;
+               *perl*) dflt=$prefix/lib/vendor_perl/$version ;;
+               *)      dflt=$prefix/lib/$package/vendor_perl/$version ;;
                esac
                ;;
-           vendorarch) dflt="$vendorlib/$apiversion/$archname" ;;
+           vendorarch) dflt="$vendorlib/$archname" ;;
 
-           vendorman1dir)      dflt="$vendorprefix/man/man1" ;;
-           vendorman3dir)      dflt="$vendorprefix/man/man3" ;;
+           vendorman1) dflt="$vendorprefix/man/man1" ;;
+           vendorman3) dflt="$vendorprefix/man/man3" ;;
            # We don't know what to do with these yet.
-           vendorhtml1dir)     dflt='' ;;
-           vendorhtm31dir)     dflt='' ;;
+           vendorhtml1)        dflt='' ;;
+           vendorhtm3) dflt='' ;;
 
            esac  # End of vendorprefix != ''
        fi
@@ -197,5 +206,5 @@ $spitshell <<!GROK!THIS! >>Policy.sh
 #   The original design for this Policy.sh file came from Wayne Davison,
 #   maintainer of trn.
 #   This version for Perl5.004_61 originally written by
-#   Andy Dougherty <doughera@lafcol.lafayette.edu>.
+#   Andy Dougherty <doughera@lafayette.edu>.
 #   This file may be distributed under the same terms as Perl itself.