X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Policy_sh.SH;h=0d9c1dfbc758c2ee07267e354f4b249198c34a96;hb=3a188f30750b7b6044dc11da3853f0d540738f37;hp=cb8536c4546446a4a7937484680db2d12bccb885;hpb=1d7c184104c076988718a01b77c8706aae05b092;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Policy_sh.SH b/Policy_sh.SH
index cb8536c..0d9c1df 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -86,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
@@ -124,8 +124,7 @@ do
 
     # 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
@@ -134,16 +133,16 @@ 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='' ;;
     
     # Directories for vendor-supplied add-on files
@@ -154,10 +153,7 @@ do
 	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
@@ -166,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