[PATCH 5.5.660] Fixes for installation directories.

While cleaning up some nits with the new Configure installation directory
stuff, I regularized some of the names.  In particular, some names had a
trailing 'dir' while others didn't.  For example, we had sitehtml1dir and
vendorhtml1.  None of these are actually used yet in perl5.5.660, so now
is the best time to ensure the names are consistent.

I've sent the relevant metaconfig patches separately to Jarkko for
inclusion into Configure.  Here are the relevant changes to INSTALL,
Policy_sh.SH, and pod/perldelta.pod.

Applly with  patch -p1 -N.  Beware that until Configure is regenerated,
it won't actually work as described here.

Patch and enjoy,

    Andy Dougherty		doughera@lafayette.edu
    Dept. of Physics
    Lafayette College, Easton PA 18042

--- p4perl/INSTALL	Wed Feb  2 11:09:56 2000
+++ p4perl-andy/INSTALL	Thu Feb 24 11:53:45 2000
@@ -369,13 +369,13 @@
     Configure variable	Default value
     $siteprefix		$prefix
     $sitebin		$siteprefix/bin
-    $sitescriptdir	$siteprefix/bin
+    $sitescript		$siteprefix/bin
     $sitelib		$siteprefix/lib/perl5/site_perl/$version
     $sitearch		$siteprefix/lib/perl5/site_perl/$version/$archname
-    $siteman1dir	$siteprefix/man/man1
-    $siteman3dir	$siteprefix/man/man3
-    $sitehtml1dir	(none)
-    $sitehtml3dir	(none)
+    $siteman1		$siteprefix/man/man1
+    $siteman3		$siteprefix/man/man3
+    $sitehtml1		(none)
+    $sitehtml3		(none)
 
 By default, ExtUtils::MakeMaker will install architecture-independent
 modules into $sitelib and architecture-dependent modules into $sitearch.
@@ -390,13 +390,13 @@
     $vendorprefix	(none)
     (The next ones are set only if vendorprefix is set.)
     $vendorbin		$vendorprefix/bin
-    $vendorscriptdir	$vendorprefix/bin
+    $vendorscript	$vendorprefix/bin
     $vendorlib		$vendorprefix/lib/perl5/vendor_perl/$version
     $vendorarch		$vendorprefix/lib/perl5/vendor_perl/$version/$archname
-    $vendorman1dir	$vendorprefix/man/man1
-    $vendorman3dir	$vendorprefix/man/man3
-    $vendorhtml1dir	(none)
-    $vendorhtml3dir	(none)
+    $vendorman1		$vendorprefix/man/man1
+    $vendorman3		$vendorprefix/man/man3
+    $vendorhtml1	(none)
+    $vendorhtml3	(none)
 
 These are normally empty, but may be set as needed.  For example,
 a vendor might choose the following settings:
@@ -415,18 +415,18 @@
 	$man3dir	/usr/man/man3
 
 	$sitebin	/usr/local/bin
-	$sitescriptdir	/usr/local/bin
+	$sitescript	/usr/local/bin
 	$sitelib	/usr/local/lib/perl5/site_perl/$version
 	$sitearch	/usr/local/lib/perl5/site_perl/$version/$archname
-	$siteman1dir	/usr/local/man/man1
-	$siteman3dir	/usr/local/man/man3
+	$siteman1	/usr/local/man/man1
+	$siteman3	/usr/local/man/man3
 
-	$vendorbin		/usr/bin
-	$vendorscriptdir	/usr/bin
+	$vendorbin	/usr/bin
+	$vendorscript	/usr/bin
 	$vendorlib	/usr/lib/perl5/vendor_perl/$version
 	$vendorarch	/usr/lib/perl5/vendor_perl/$version/$archname
-	$vendorman1dir	/usr/man/man1
-	$vendorman3dir	/usr/man/man3
+	$vendorman1	/usr/man/man1
+	$vendorman3	/usr/man/man3
 
 Note how in this example, the vendor-supplied directories are in the
 /usr hierarchy, while the directories reserved for the end-user are in
--- p4perl/pod/perldelta.pod	Wed Feb 23 09:48:33 2000
+++ p4perl-andy/pod/perldelta.pod	Thu Feb 24 16:16:09 2000
@@ -386,12 +386,20 @@
 
 =head2 Enhanced Installation Directories
 
-The installation structure has been enriched to improve the support for 
-maintaining multiple versions of perl, to provide locations for
-vendor-supplied modules and scripts, and to ease maintenance of
-locally-added modules and scripts.  See the section on Installation 
-Directories in the INSTALL file for complete details.  For most users
-building and installing from source, the defaults should be fine.
+The installation structure has been enriched to improve the support
+for maintaining multiple versions of perl, to provide locations for
+vendor-supplied modules, scripts, and manpages, and to ease maintenance
+of locally-added modules, scripts, and manpages.  See the section on
+Installation Directories in the INSTALL file for complete details.
+For most users building and installing from source, the defaults should
+be fine.
+
+If you previously used C<Configure -Dsitelib> or C<-Dsitearch> to set
+special values for library directories, you might wish to consider using
+the new C<-Dsiteprefix> setting instead.  Also, if you wish to re-use a
+config.sh file from an earlier version of perl, you should be sure to
+check that Configure makes sensible choices for the new directories.
+See INSTALL for complete details.
 
 =head1 Core Changes
 
--- p4perl/Policy_sh.SH	Mon Jan 24 14:21:32 2000
+++ p4perl-andy/Policy_sh.SH	Thu Feb 24 13:06:52 2000
@@ -86,8 +86,8 @@
 
 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 @@
 
     # 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
@@ -140,10 +139,10 @@
 	;;
     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 @@
 	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
@@ -172,11 +168,11 @@
 		;;
 	    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

• [PATCH 5.5.660] Fixes for installation directories. by Andy Dougherty