From 3ea7755680302231fb5fb2feb962b211d651338f Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 8 Jul 2003 05:24:58 +0000
Subject: Retract #20065: I don't think this is the right way to patch this
 issue.

p4raw-id: //depot/perl@20066
---
 Policy_sh.SH | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'Policy_sh.SH')

diff --git a/Policy_sh.SH b/Policy_sh.SH
index fe7b9f05e2..adce8b643a 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -125,16 +125,16 @@ esac
 #   $bin $scriptdir $privlib $archlib 
 #	$man1dir $man3dir $html1dir $html3dir 
 #   $sitebin $sitescript $sitelib $sitearch 
-#	$siteman1dir $siteman3dir $sitehtml1dir $sitehtml3dir
+#	$siteman1 $siteman3 $sitehtml1 $sitehtml3
 #   $vendorbin $vendorscript $vendorlib $vendorarch
-#	$vendorman1dir $vendorman3dir $vendorhtml1dir $vendorhtml3dir
+#	$vendorman1 $vendorman3 $vendorhtml1 $vendorhtml3
 
 for var in \
 	bin scriptdir privlib archlib man1dir man3dir html1dir html3dir \
 	sitebin sitescript sitelib sitearch \
-		siteman1dir siteman3dir sitehtml1dir sitehtml3dir \
+		siteman1 siteman3 sitehtml1 sitehtml3 \
 	vendorbin vendorscript vendorlib vendorarch \
-		vendorman1dir vendorman3dir vendorhtml1dir vendorhtml3dir
+		vendorman1 vendorman3 vendorhtml1 vendorhtml3
 do
 	
     case "$var" in
@@ -184,11 +184,11 @@ do
 	;;
     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='' ;;
-    sitehtml3dir)	dflt='' ;;
+    sitehtml1)	dflt='' ;;
+    sitehtm31dir)	dflt='' ;;
     
     # Directories for vendor-supplied add-on files
     # These are all usually empty.
@@ -213,11 +213,11 @@ do
 		;;
 	    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='' ;;
-	    vendorhtml3dir)	dflt='' ;;
+	    vendorhtml1)	dflt='' ;;
+	    vendorhtm3)	dflt='' ;;
 
 	    esac  # End of vendorprefix != ''
 	fi
-- 
cgit v1.2.1