Fix long-standing typos in Policy_sh.SH

This patch fixes several long-standing typos and naming confusions in
Policy_sh.SH, standardizing on the variable names used in config.sh.
This will change the behavior of Policy.sh if you happen to have been
accidentally relying on the Policy.sh incorrect behavior.  I'd appreciate
feedback from anyone using Policy.sh to be sure nothing is broken by
this change.  Thanks to Stoned Elipot for pointing this out.

Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>

diff --git a/Policy_sh.SH b/Policy_sh.SH
index a618d23..cc310dd 100644 (file)
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -130,7 +130,8 @@ esac
 #      $vendorman1dir $vendorman3dir $vendorhtml1dir $vendorhtml3dir
 
 for var in \
-       bin scriptdir privlib archlib man1dir man3dir html1dir html3dir \
+       bin scriptdir privlib archlib man1dir man3dir man1ext man3ext \
+       html1dir html3dir \
        sitebin sitescript sitelib sitearch \
                siteman1dir siteman3dir sitehtml1dir sitehtml3dir \
        vendorbin vendorscript vendorlib vendorarch \
@@ -165,7 +166,7 @@ do
 
     # We don't know what to do with these yet.
     html1dir)  dflt='' ;;
-    htm31dir)  dflt='' ;;
+    html3dir)  dflt='' ;;
 
     # Directories for site-specific add-on files
     sitebin)   dflt=$siteprefix/bin ;;
@@ -184,11 +185,11 @@ do
        ;;
     sitearch)  dflt="$sitelib/$archname" ;;
 
-    siteman1)  dflt="$siteprefix/man/man1" ;;
-    siteman3)  dflt="$siteprefix/man/man3" ;;
+    siteman1dir) dflt="$siteprefix/man/man1" ;;
+    siteman3dir) dflt="$siteprefix/man/man3" ;;
     # We don't know what to do with these yet.
-    sitehtml1) dflt='' ;;
-    sitehtm31dir)      dflt='' ;;
+    sitehtml1dir)      dflt='' ;;
+    sitehtml3dir)      dflt='' ;;
     
     # Directories for vendor-supplied add-on files
     # These are all usually empty.
@@ -213,11 +214,11 @@ do
                ;;
            vendorarch) dflt="$vendorlib/$archname" ;;
 
-           vendorman1) dflt="$vendorprefix/man/man1" ;;
-           vendorman3) dflt="$vendorprefix/man/man3" ;;
+           vendorman1dir)      dflt="$vendorprefix/man/man1" ;;
+           vendorman3dir)      dflt="$vendorprefix/man/man3" ;;
            # We don't know what to do with these yet.
-           vendorhtml1)        dflt='' ;;
-           vendorhtm3) dflt='' ;;
+           vendorhtml1dir)     dflt='' ;;
+           vendorhtml3dir)     dflt='' ;;
 
            esac  # End of vendorprefix != ''
        fi