Config_70-01: Remove default "/share"

	Message-Id: <Pine.SUN.3.96.980706130959.20719A-100000@newton.phys>

p4raw-id: //depot/perl@1352

6 files changed, 401 insertions, 88 deletions

diff --git a/Configure b/Configure
index d7076767b6..e58fdc8ad4 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Wed Jul  1 12:16:14 EDT 1998 [metaconfig 3.0 PL70]
+# Generated on Mon Jul  6 11:11:11 EDT 1998 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by doughera@lafayette.edu)
 
 cat >/tmp/c1$$ <<EOF
@@ -2748,12 +2748,12 @@ else
 fi
 
 : determine where private library files go
-: Usual default is /usr/local/lib/perl5/$version/share.
-: Also allow things like /opt/perl/lib/$version/share, since 
+: Usual default is /usr/local/lib/perl5/$version.
+: Also allow things like /opt/perl/lib/$version, since 
 : /opt/perl/lib/perl5... would be redundant.
 case "$prefix" in
-*perl*) set dflt privlib lib/$version/share ;;
-*)	 set dflt privlib lib/$package/$version/share ;;
+*perl*) set dflt privlib lib/$version ;;
+*)	 set dflt privlib lib/$package/$version ;;
 esac
 eval $prefixit
 $cat <<EOM
@@ -2799,8 +2799,9 @@ esac'
 : determine where public architecture dependent libraries go
 set archlib archlib
 eval $prefixit
-: privlib default is /usr/local/lib/$package/$version/share
+: privlib default is /usr/local/lib/$package/$version
 : archlib default is /usr/local/lib/$package/$version/$archname
+: privlib may have an optional trailing /share.
 tdflt=`echo $privlib | $sed 's,/share$,,'`
 tdflt=$tdflt/$archname
 case "$archlib" in
@@ -4758,23 +4759,13 @@ EOM
 			hpux)	dflt='+z' ;;
 			next)	dflt='none' ;;
 			irix*)	dflt='-KPIC' ;;
-			svr4*|esix*|solaris)
-				case "$ccflags" in
-					*-DDEBUGGING*)	dflt='-KPIC' ;;
-					*)	dflt='-Kpic' ;;
-				esac 
-				;;
+			svr4*|esix*|solaris) dflt='-KPIC' ;;
 			sunos)	dflt='-pic' ;;
 			*)	dflt='none' ;;
 		    esac
 			;;
 		*)  case "$osname" in
-			svr4*|esix*|solaris)
-				case "$ccflags" in
-					*-DDEBUGGING*)	dflt='-fPIC' ;;
-					*)	dflt='-fpic' ;;
-				esac 
-				;;
+			svr4*|esix*|solaris) dflt='-fPIC' ;;
 			*)	dflt='-fpic' ;;
 		    esac ;;
 	    esac ;;
@@ -5781,11 +5772,11 @@ else
 fi
 
 : determine where site specific libraries go.
-: Usual default is /usr/local/lib/perl5/site_perl/$apiversion/share
+: Usual default is /usr/local/lib/perl5/site_perl/$apiversion
 prog=`echo $package | $sed 's/-*[0-9.]*$//'`
 case "$prefix" in
-*perl*) set dflt sitelib lib/site_$prog/$apiversion/share ;;
-*)	 set dflt sitelib lib/$package/site_$prog/$apiversion/share ;;
+*perl*) set dflt sitelib lib/site_$prog/$apiversion ;;
+*)	 set dflt sitelib lib/$package/site_$prog/$apiversion ;;
 esac
 eval $prefixit
 $cat <<EOM
@@ -5826,8 +5817,9 @@ else
 fi
 
 : determine where site specific architecture-dependent libraries go.
-: sitelib  default is /usr/local/lib/perl5/site_perl/$apiversion/share
+: sitelib  default is /usr/local/lib/perl5/site_perl/$apiversion
 : sitearch default is /usr/local/lib/perl5/site_perl/$apiversion/$archname
+: sitelib may have an optional trailing /share.
 tdflt=`echo $sitelib | $sed 's,/share$,,'`
 tdflt="$tdflt/$archname"
 set sitearch sitearch none
diff --git a/INSTALL b/INSTALL
index 8f1dd4bf9f..aadf2c7c24 100644
--- a/INSTALL
+++ b/INSTALL
@@ -316,7 +316,7 @@ This should actually work if you have gdbm installed in any of
 =item gdbm in /usr/you
 
 Suppose you have gdbm installed in some place other than /usr/local/,
-but you still want Configure to find it.  To be specific, assume  you
+but you still want Configure to find it.  To be specific, assume you
 have /usr/you/include/gdbm.h and /usr/you/lib/libgdbm.a.  You
 still have to add -I/usr/you/include to cc flags, but you have to take
 an extra step to help Configure find libgdbm.a.  Specifically, when
@@ -355,19 +355,24 @@ everything where you want it.  At any point during the Configure
 process, you can answer a question with  &-d  and Configure
 will use the defaults from then on.
 
-By default, Configure will use the following directories for
-library files for 5.005 (archname is a string like sun4-sunos, determined
-by Configure).
+By default, Configure will use the following directories for library files
+for 5.005 (archname is a string like sun4-sunos, determined by Configure).
 
-	/usr/local/lib/perl5/5.005/archname
-	/usr/local/lib/perl5/5.005/share
-	/usr/local/lib/perl5/site_perl/5.005/archname
-	/usr/local/lib/perl5/site_perl/5.005/share
+    Configure variable		Default value
+	$archlib 	/usr/local/lib/perl5/5.005/archname
+	$privlib	/usr/local/lib/perl5/5.005
+	$sitearch	/usr/local/lib/perl5/site_perl/5.005/archname
+	$sitelib	/usr/local/lib/perl5/site_perl/5.005
 
-and the following directories for manual pages:
+Some users prefer to append a "/share" to $privlib and $sitelib
+to emphasize that those directories can be shared among different
+architectures.
 
-	/usr/local/man/man1
-	/usr/local/lib/perl5/man/man3
+By default, Configure will use the following directories for manual pages:
+
+    Configure variable		Default value
+	$man1dir	/usr/local/man/man1
+	$man3dir	/usr/local/lib/perl5/man/man3
 
 (Actually, Configure recognizes the SVR3-style
 /usr/local/man/l_man/man1 directories, if present, and uses those
@@ -393,18 +398,19 @@ If you specify a prefix that contains the string "perl", then the
 directory structure is simplified.  For example, if you Configure with
 -Dprefix=/opt/perl, then the defaults for 5.005 are
 
-	/opt/perl/lib/5.005/archname
-	/opt/perl/lib/5.005/share
-	/opt/perl/lib/site_perl/5.005/archname
-	/opt/perl/lib/site_perl/5.005/share
+    Configure variable		Default value
+	$archlib	/opt/perl/lib/5.005/archname
+	$privlib	/opt/perl/lib/5.005
+	$sitearch	/opt/perl/lib/site_perl/5.005/archname
+	$sitelib	/opt/perl/lib/site_perl/5.005
 
-	/opt/perl/man/man1
-	/opt/perl/man/man3
+	$man1dir	/opt/perl/man/man1
+	$man3dir	/opt/perl/man/man3
 
 The perl executable will search the libraries in the order given
 above.
 
-The  directories under site_perl are empty, but are intended to be used
+The directories under site_perl are empty, but are intended to be used
 for installing local or site-wide extensions.  Perl will automatically
 look in these directories.
 
@@ -958,7 +964,7 @@ for further tips and information.
 If you can successfully build miniperl, but the process crashes
 during the building of extensions, you should run
 
-    	make minitest
+	make minitest
 
 to test your version of miniperl.
 
@@ -1346,7 +1352,7 @@ make install will install the following:
 Installperl will also create the library directories $siteperl and
 $sitearch listed in config.sh.  Usually, these are something like
 
-	/usr/local/lib/perl5/site_perl/5.005/share
+	/usr/local/lib/perl5/site_perl/5.005
 	/usr/local/lib/perl5/site_perl/5.005/archname
 
 where archname is something like sun4-sunos.  These directories
@@ -1379,16 +1385,16 @@ The directories searched by version 5.005 will be
 
     Configure variable		Default value
 	$archlib 	/usr/local/lib/perl5/5.005/archname
-	$privlib	/usr/local/lib/perl5/5.005/share
+	$privlib	/usr/local/lib/perl5/5.005
 	$sitearch	/usr/local/lib/perl5/site_perl/5.005/archname
-	$sitelib	/usr/local/lib/perl5/site_perl/5.005/share
+	$sitelib	/usr/local/lib/perl5/site_perl/5.005
 
 while the directories searched by version 5.005_01 will be
 
 	$archlib 	/usr/local/lib/perl5/5.00501/archname
-	$privlib	/usr/local/lib/perl5/5.00501/share
+	$privlib	/usr/local/lib/perl5/5.00501
 	$sitearch	/usr/local/lib/perl5/site_perl/5.005/archname
-	$sitelib	/usr/local/lib/perl5/site_perl/5.005/share
+	$sitelib	/usr/local/lib/perl5/site_perl/5.005
 
 When you install an add-on extension, it gets installed into $sitelib (or
 $sitearch if it is architecture-specific).  This directory deliberately
@@ -1567,4 +1573,4 @@ the contact information to match your distribution.
 
 =head1 LAST MODIFIED
 
-$Id: INSTALL,v 1.39 1998/07/02 15:41:45 doughera Released $
+$Id: INSTALL,v 1.40 1998/07/06 14:49:02 doughera Released $
diff --git a/Policy_sh.SH b/Policy_sh.SH
index e25ccc3e91..52a2c57da5 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -19,13 +19,6 @@ $startsh
 #  platform-specific hints file.
 #
 
-#Credits:
-#   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>.
-#   This file may be distributed under the same terms as Perl itself.
-
 #  Allow Configure command-line overrides; usually these won't be
 #  needed, but something like -Dprefix=/test/location can be quite
 #  useful for testing out new versions.
@@ -57,7 +50,7 @@ esac
 # out.  That way, if you override prefix, all of these will be
 # automatically adjusted.
 #
-# NOTE:  Be especially careful about architecture-dependent and
+# WARNING:  Be especially careful about architecture-dependent and
 # version-dependent names, particularly if you reuse this file for
 # different versions of perl.
 
@@ -81,8 +74,8 @@ for var in bin scriptdir privlib archlib \
 	;;
     privlib)
 	case "$prefix" in
-	*perl*)	dflt=$prefix/lib/$version/share ;;
-	*)	dflt=$prefix/lib/$package/$version/share ;;
+	*perl*)	dflt=$prefix/lib/$version ;;
+	*)	dflt=$prefix/lib/$package/$version ;;
 	esac
 	;;
     archlib)	
@@ -93,8 +86,8 @@ for var in bin scriptdir privlib archlib \
 	;;
     sitelib)
 	case "$prefix" in
-	*perl*)	dflt=$prefix/lib/site_perl/$apiversion/share ;;
-	*)	dflt=$prefix/lib/$package/site_perl/$apiversion/share ;;
+	*perl*)	dflt=$prefix/lib/site_perl/$apiversion ;;
+	*)	dflt=$prefix/lib/$package/site_perl/$apiversion ;;
 	esac
 	;;
     sitearch)	
@@ -150,3 +143,11 @@ $spitshell <<!GROK!THIS! >>Policy.sh
 #  Porting/Glossary.
 
 !GROK!THIS!
+
+#Credits:
+#   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>.
+#   This file may be distributed under the same terms as Perl itself.
+
diff --git a/Porting/Glossary b/Porting/Glossary
index d54a0b0334..e2d91a944f 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -4,6 +4,11 @@ programs (e.g. I_UNISTD) are already described in config_h.SH.  [`configpm'
 generates pod documentation for Config.pm from this file--please try to keep
 the formatting regular.]
 
+Mcc (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the Mcc program.  After Configure runs,
+	the value is reset to a plain "Mcc" and is not useful.
+
 _a (Unix.U):
 	This variable defines the extension used for ordinary libraries.
 	For unix, it is '.a'.  The '.' is included.  Other possible
@@ -46,6 +51,11 @@ apiversion (patchlevel.U):
 	from patchlevel.h.  For now, we'll guess maintenance subversions
 	will retain binary compatibility.
 
+ar (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the ar program.  After Configure runs,
+	the value is reset to a plain "ar" and is not useful.
+
 archlib (archlib.U):
 	This variable holds the name of the directory in which the user wants
 	to put architecture-dependent public library files for $package.
@@ -68,9 +78,18 @@ archobjs (Unix.U):
 	or other facilities.  For perl on OS/2, for example, this would
 	include os2/os2.obj.
 
+awk (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the awk program.  After Configure runs,
+	the value is reset to a plain "awk" and is not useful.
+
 baserev (baserev.U):
 	The base revision level of this package, from the .package file.
 
+bash (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 bin (bin.U):
 	This variable holds the name of the directory in which the user wants
 	to put publicly executable images for the package in question.  It
@@ -81,6 +100,15 @@ binexp (bin.U):
 	This is the same as the bin variable, but is filename expanded at
 	configuration time, for use in your makefiles.
 
+bison (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+byacc (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the byacc program.  After Configure runs,
+	the value is reset to a plain "byacc" and is not useful.
+
 byteorder (byteorder.U):
 	This variable holds the byte order. In the following, larger digits
 	indicate more significance.  The variable byteorder is either 4321
@@ -100,6 +128,11 @@ castflags (d_castneg.U):
 		2 = couldn't cast >= 0x80000000
 		4 = couldn't cast in argument expression list
 
+cat (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the cat program.  After Configure runs,
+	the value is reset to a plain "cat" and is not useful.
+
 cc (cc.U):
 	This variable holds the name of a command to execute a C compiler which
 	can resolve multiple global references that happen to have the same
@@ -108,12 +141,12 @@ cc (cc.U):
 cccdlflags (dlsrc.U):
 	This variable contains any special flags that might need to be
 	passed with cc -c to compile modules to be used to create a shared
-	library that will be used for dynamic loading.  For hpux, this 
+	library that will be used for dynamic loading.  For hpux, this
 	should be +z.  It is up to the makefile to use it.
 
 ccdlflags (dlsrc.U):
 	This variable contains any special flags that might need to be
-	passed to cc to link with a shared library for dynamic loading. 
+	passed to cc to link with a shared library for dynamic loading.
 	It is up to the makefile to use it.  For sunos 4.1, it should
 	be empty.
 
@@ -133,17 +166,52 @@ cf_time (cf_who.U):
 	Holds the output of the "date" command when the configuration file was
 	produced. This is used to tag both config.sh and config_h.SH.
 
+chgrp (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+chmod (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+chown (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 clocktype (d_times.U):
 	This variable holds the type returned by times(). It can be long,
 	or clock_t on BSD sites (in which case <sys/types.h> should be
 	included).
 
+comm (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the comm program.  After Configure runs,
+	the value is reset to a plain "comm" and is not useful.
+
+compress (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 contains (contains.U):
 	This variable holds the command to do a grep with a proper return
 	status.  On most sane systems it is simply "grep".  On insane systems
 	it is a grep followed by a cat followed by a test.  This variable
 	is primarily for the use of other Configure units.
 
+cp (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the cp program.  After Configure runs,
+	the value is reset to a plain "cp" and is not useful.
+
+cpio (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+cpp (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the cpp program.  After Configure runs,
+	the value is reset to a plain "cpp" and is not useful.
+
 cpp_stuff (cpp_stuff.U):
 	This variable contains an identification of the catenation mechanism
 	used by the C preprocessor.
@@ -181,6 +249,11 @@ cryptlib (d_crypt.U):
 	the crypt() function is not defined in the standard C library. It is
 	up to the Makefile to use this.
 
+csh (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the csh program.  After Configure runs,
+	the value is reset to a plain "csh" and is not useful.
+
 d_Gconvert (d_gconvert.U):
 	This variable holds what Gconvert is defined as to convert
 	floating point numbers into strings. It could be 'gconvert'
@@ -1148,6 +1221,11 @@ d_xenix (Guess.U):
 	This variable conditionally defines the symbol XENIX, which alerts
 	the C program that it runs under Xenix.
 
+date (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the date program.  After Configure runs,
+	the value is reset to a plain "date" and is not useful.
+
 db_hashtype (i_db.U):
 	This variable contains the type of the hash structure element
 	in the <db.h> header file.  In older versions of DB, it was
@@ -1184,6 +1262,20 @@ eagain (nblock_io.U):
 	data is present on the file and non-blocking I/O was enabled (otherwise,
 	read() blocks naturally).
 
+echo (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the echo program.  After Configure runs,
+	the value is reset to a plain "echo" and is not useful.
+
+egrep (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the egrep program.  After Configure runs,
+	the value is reset to a plain "egrep" and is not useful.
+
+emacs (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 eunicefix (Init.U):
 	When running under Eunice this variable contains a command which will
 	convert a shell script to the proper form of text file for it to be
@@ -1192,18 +1284,32 @@ eunicefix (Init.U):
 exe_ext (Unix.U):
 	This is an old synonym for _exe.
 
+expr (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the expr program.  After Configure runs,
+	the value is reset to a plain "expr" and is not useful.
+
 extensions (Extensions.U):
 	This variable holds a list of all extension files (both XS and
 	non-xs linked into the package.  It is propagated to Config.pm
 	and is typically used to test whether a particular extesion 
 	is available.
 
+find (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the find program.  After Configure runs,
+	the value is reset to a plain "find" and is not useful.
+
 firstmakefile (Unix.U):
 	This variable defines the first file searched by make.  On unix,
 	it is makefile (then Makefile).  On case-insensitive systems,
 	it might be something else.  This is only used to deal with
 	convoluted make depend tricks.
 
+flex (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 fpostype (fpostype.U):
 	This variable defines Fpos_t to be something like fpost_t, long, 
 	uint, or whatever type is used to declare file positions in libc.
@@ -1236,6 +1342,11 @@ gidtype (gidtype.U):
 	ushort, or whatever type is used to declare the return type
 	of getgid().  Typically, it is the type of group ids in the kernel.
 
+grep (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the grep program.  After Configure runs,
+	the value is reset to a plain "grep" and is not useful.
+
 groupcat (nis.U):
 	This variable contains a command that produces the text of the
 	/etc/group file.  This is normally "cat /etc/group", but can be
@@ -1247,6 +1358,11 @@ groupstype (groupstype.U):
 	getgroups() and setgroups().  Usually, this is the same as
 	gidtype (gid_t), but sometimes it isn't.
 
+gzip (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the gzip program.  After Configure runs,
+	the value is reset to a plain "gzip" and is not useful.
+
 h_fcntl (h_fcntl.U):
 	This is variable gets set in various places to tell i_fcntl that
 	<fcntl.h> should be included.
@@ -1512,6 +1628,10 @@ incpath (usrinc.U):
 	right one, as in "$incpath/usr/include" or "$incpath/usr/lib".
 	Value can be "" or "/bsd43" on mips.
 
+inews (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 installarchlib (archlib.U):
 	This variable is really the same as archlibexp but may differ on
 	those systems using AFS. For extra portability, only this variable
@@ -1562,6 +1682,10 @@ known_extensions (Extensions.U):
 	This variable holds a list of all XS extensions included in 
 	the package.
 
+ksh (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 large (models.U):
 	This variable contains a flag which will tell the C compiler and loader
 	to produce a program running with a large memory model.  It is up to
@@ -1583,6 +1707,11 @@ ldflags (ccflags.U):
 	This variable contains any additional C loader flags desired by
 	the user.  It is up to the Makefile to use this.
 
+less (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the less program.  After Configure runs,
+	the value is reset to a plain "less" and is not useful.
+
 lib_ext (Unix.U):
 	This is an old synonym for _a.
 
@@ -1610,10 +1739,24 @@ libswanted (Myinit.U):
 	search.  The order is chosen to pick up the c library
 	ahead of ucb or bsd libraries for SVR4.
 
+line (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the line program.  After Configure runs,
+	the value is reset to a plain "line" and is not useful.
+
+lint (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 lkflags (ccflags.U):
 	This variable contains any additional C partial linker flags desired by
 	the user.  It is up to the Makefile to use this.
 
+ln (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the ln program.  After Configure runs,
+	the value is reset to a plain "ln" and is not useful.
+
 lns (lns.U):
 	This variable holds the name of the command to make 
 	symbolic links (if they are supported).  It can be used
@@ -1645,11 +1788,37 @@ longsize (intsize.U):
 	This variable contains the value of the LONGSIZE symbol, which
 	indicates to the C program how many bytes there are in a long.
 
+lp (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+lpr (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+ls (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the ls program.  After Configure runs,
+	the value is reset to a plain "ls" and is not useful.
+
 lseektype (lseektype.U):
 	This variable defines lseektype to be something like off_t, long, 
 	or whatever type is used to declare lseek offset's type in the
 	kernel (which also appears to be lseek's return type).
 
+mail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+mailx (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+make (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the make program.  After Configure runs,
+	the value is reset to a plain "make" and is not useful.
+
 make_set_make (make.U):
 	Some versions of 'make' set the variable MAKE.  Others do not.
 	This variable contains the string to be included in Makefile.SH
@@ -1716,6 +1885,11 @@ mips_type (usrinc.U):
 	This variable holds the environment type for the mips system.
 	Possible values are "BSD 4.3" and "System V".
 
+mkdir (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the mkdir program.  After Configure runs,
+	the value is reset to a plain "mkdir" and is not useful.
+
 models (models.U):
 	This variable contains the list of memory models supported by this
 	system.  Possible component values are none, split, unsplit, small,
@@ -1726,6 +1900,15 @@ modetype (modetype.U):
 	int, unsigned short, or whatever type is used to declare file 
 	modes for system calls.
 
+more (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the more program.  After Configure runs,
+	the value is reset to a plain "more" and is not useful.
+
+mv (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 myarchname (archname.U):
 	This variable holds the architecture name computed by Configure in
 	a previous run. It is not intended to be perused by any user and
@@ -1774,6 +1957,11 @@ netdb_net_type (netdbtype.U):
 	getnetbyaddr().  Usually, this is int or long.
 	This is only useful if you have getnetbyaddr(), naturally.
 
+nm (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the nm program.  After Configure runs,
+	the value is reset to a plain "nm" and is not useful.
+
 nm_opt (usenm.U):
 	This variable holds the options that may be necessary for nm.
 
@@ -1789,6 +1977,11 @@ nonxs_ext (Extensions.U):
 	This variable holds a list of all non-xs extensions included
 	in the package.  All of them will be built.
 
+nroff (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the nroff program.  After Configure runs,
+	the value is reset to a plain "nroff" and is not useful.
+
 o_nonblock (nblock_io.U):
 	This variable bears the symbol value to be used during open() or fcntl()
 	to turn on non-blocking I/O for a file descriptor. If you wish to switch
@@ -1844,6 +2037,11 @@ path_sep (Unix.U):
 	This is an old synonym for p_ in Head.U, the character
 	used to separate elements in the command shell search PATH.
 
+perl (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the perl program.  After Configure runs,
+	the value is reset to a plain "perl" and is not useful.
+
 perladmin (perladmin.U):
 	Electronic mail address of the perl5 administrator.
 
@@ -1852,6 +2050,11 @@ perlpath (perlpath.U):
 	which contains the name of the perl interpreter to be used in
 	shell scripts and in the "eval 'exec'" idiom.
 
+pg (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the pg program.  After Configure runs,
+	the value is reset to a plain "pg" and is not useful.
+
 phostname (myhostname.U):
 	This variable contains the eventual value of the PHOSTNAME symbol,
 	which is a command that can be fed to popen() to get the host name.
@@ -1867,6 +2070,14 @@ plibpth (libpth.U):
 	Its value is prepend to libpth. This variable takes care of special
 	machines, like the mips.  Usually, it should be empty.
 
+pmake (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+pr (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 prefix (prefix.U):
 	This variable holds the name of the directory below which the
 	user will install the package.  Usually, this is /usr/local, and
@@ -1912,6 +2123,15 @@ rd_nodata (nblock_io.U):
 	used, which is a shame because you cannot make the difference between
 	no data and an EOF.. Sigh!
 
+rm (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the rm program.  After Configure runs,
+	the value is reset to a plain "rm" and is not useful.
+
+rmail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 runnm (usenm.U):
 	This variable contains 'true' or 'false' depending whether the
 	nm extraction should be performed or not, according to the value
@@ -1928,12 +2148,22 @@ scriptdirexp (scriptdir.U):
 	This variable is the same as scriptdir, but is filename expanded
 	at configuration time, for programs not wanting to bother with it.
 
+sed (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the sed program.  After Configure runs,
+	the value is reset to a plain "sed" and is not useful.
+
 selecttype (selecttype.U):
 	This variable holds the type used for the 2nd, 3rd, and 4th
 	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
 	is defined, and 'int *' otherwise.  This is only useful if you 
 	have select(), naturally.
 
+sendmail (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the sendmail program.  After Configure runs,
+	the value is reset to a plain "sendmail" and is not useful.
+
 sh (sh.U):
 	This variable contains the full pathname of the shell used
 	on this system to execute Bourne shell scripts.  Usually, this will be
@@ -1944,6 +2174,10 @@ sh (sh.U):
 	option, though you can override this (and startsh)
 	with -O -Dsh=/bin/whatever -Dstartsh=whatever
 
+shar (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 sharpbang (spitshell.U):
 	This variable contains the string #! if this system supports that
 	construct.
@@ -2023,6 +2257,14 @@ sizetype (sizetype.U):
 	unsigned long, or whatever type is used to declare length 
 	parameters for string functions.
 
+sleep (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+smail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 small (models.U):
 	This variable contains a flag which will tell the C compiler and loader
 	to produce a program running with a small memory model.  It is up to
@@ -2038,6 +2280,11 @@ sockethdr (d_socket.U):
 socketlib (d_socket.U):
 	This variable has the names of any libraries needed for socket support.
 
+sort (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the sort program.  After Configure runs,
+	the value is reset to a plain "sort" and is not useful.
+
 spackage (package.U):
 	This variable contains the name of the package being constructed,
 	with the first letter uppercased, i.e. suitable for starting
@@ -2117,6 +2364,10 @@ strings (i_string.U):
 	This variable holds the full path of the string header that will be
 	used. Typically /usr/include/string.h or /usr/include/strings.h.
 
+submit (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 subversion (patchlevel.U):
 	The subversion level of this package.
 	The value of subversion comes from the patchlevel.h file.
@@ -2128,6 +2379,28 @@ sysman (sysman.U):
 	pages. Rather it is the place where Configure may look to find manual
 	for unix commands (section 1 of the manual usually). See mansrc.
 
+tail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tar (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tbl (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tee (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the tee program.  After Configure runs,
+	the value is reset to a plain "tee" and is not useful.
+
+test (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the test program.  After Configure runs,
+	the value is reset to a plain "test" and is not useful.
+
 timeincl (i_time.U):
 	This variable holds the full path of the included time header(s).
 
@@ -2136,10 +2409,34 @@ timetype (d_time.U):
 	or time_t on BSD sites (in which case <sys/types.h> should be
 	included). Anyway, the type Time_t should be used.
 
+touch (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the touch program.  After Configure runs,
+	the value is reset to a plain "touch" and is not useful.
+
+tr (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the tr program.  After Configure runs,
+	the value is reset to a plain "tr" and is not useful.
+
+troff (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 uidtype (uidtype.U):
 	This variable defines Uid_t to be something like uid_t, int, 
 	ushort, or whatever type is used to declare user ids in the kernel.
 
+uname (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the uname program.  After Configure runs,
+	the value is reset to a plain "uname" and is not useful.
+
+uniq (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the uniq program.  After Configure runs,
+	the value is reset to a plain "uniq" and is not useful.
+
 usedl (dlsrc.U):
 	This variable indicates if the the system supports dynamic
 	loading of some sort.  See also dlsrc and dlobj.
@@ -2198,6 +2495,10 @@ usrinc (usrinc.U):
 	This variable holds the path of the include files, which is
 	usually /usr/include. It is mainly used by other Configure units.
 
+uuname (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 version (patchlevel.U):
 	The full version number of this package.  This combines
 	baserev, patchlevel, and subversion to get the full
@@ -2205,8 +2506,21 @@ version (patchlevel.U):
 	is taken to use the C locale in order to get something
 	like 5.004 instead of 5,004.  This is unique to perl.
 
+vi (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 voidflags (voidflags.U):
 	This variable contains the eventual value of the VOIDFLAGS symbol,
 	which indicates how much support of the void type is given by this
 	compiler.  See VOIDFLAGS for more info.
 
+zcat (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+zip (Loc.U):
+	This variable is be used internally by Configure to determine the
+	full pathname (if any) of the zip program.  After Configure runs,
+	the value is reset to a plain "zip" and is not useful.
+
diff --git a/Porting/config.sh b/Porting/config.sh
index 22065d4756..0cfac064d5 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed Jul  1 12:34:37 EDT 1998
+# Configuration time: Mon Jul  6 12:35:32 EDT 1998
 # Configured by     : doughera
 # Target system     : linux fractal 2.0.34 #1 tue jun 23 10:09:17 edt 1998 i686 unknown 
 
@@ -30,10 +30,10 @@ afs='false'
 alignbytes='4'
 ansi2knr=''
 aphostname=''
-apiversion='5.00469'
+apiversion='5.00470'
 ar='ar'
-archlib='/opt/perl/lib/5.00469/i686-linux-thread'
-archlibexp='/opt/perl/lib/5.00469/i686-linux-thread'
+archlib='/opt/perl/lib/5.00470/i686-linux-thread'
+archlibexp='/opt/perl/lib/5.00470/i686-linux-thread'
 archname='i686-linux-thread'
 archobjs=''
 awk='awk'
@@ -53,7 +53,7 @@ ccdlflags='-rdynamic'
 ccflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -I/usr/local/include'
 cf_by='doughera'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Wed Jul  1 12:34:37 EDT 1998'
+cf_time='Mon Jul  6 12:35:32 EDT 1998'
 chgrp=''
 chmod=''
 chown=''
@@ -376,14 +376,14 @@ i_varhdr='stdarg.h'
 i_vfork='undef'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/5.00469/i686-linux-thread'
+installarchlib='/opt/perl/lib/5.00470/i686-linux-thread'
 installbin='/opt/perl/bin'
 installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
-installprivlib='/opt/perl/lib/5.00469/share'
+installprivlib='/opt/perl/lib/5.00470'
 installscript='/opt/perl/script'
-installsitearch='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
-installsitelib='/opt/perl/lib/site_perl/5.00469/share'
+installsitearch='/opt/perl/lib/site_perl/5.00470/i686-linux-thread'
+installsitelib='/opt/perl/lib/site_perl/5.00470'
 intsize='4'
 known_extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
 ksh=''
@@ -469,8 +469,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.00469/share'
-privlibexp='/opt/perl/lib/5.00469/share'
+privlib='/opt/perl/lib/5.00470'
+privlibexp='/opt/perl/lib/5.00470'
 prototype='define'
 ptrsize='4'
 randbits='31'
@@ -495,10 +495,10 @@ sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM
 sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "IOT", "CLD", "POLL", 0'
 sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 17, 29, 0'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
-sitearchexp='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
-sitelib='/opt/perl/lib/site_perl/5.00469/share'
-sitelibexp='/opt/perl/lib/site_perl/5.00469/share'
+sitearch='/opt/perl/lib/site_perl/5.00470/i686-linux-thread'
+sitearchexp='/opt/perl/lib/site_perl/5.00470/i686-linux-thread'
+sitelib='/opt/perl/lib/site_perl/5.00470'
+sitelibexp='/opt/perl/lib/site_perl/5.00470'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -523,7 +523,7 @@ stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 strings='/usr/include/string.h'
 submit=''
-subversion='69'
+subversion='70'
 sysman='/usr/man/man1'
 tail=''
 tar=''
@@ -550,7 +550,7 @@ usethreads='define'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
-version='5.00469'
+version='5.00470'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
@@ -570,5 +570,5 @@ config_arg7='-Dmydomain=.yourplace.com'
 config_arg8='-Dmyhostname=yourhost'
 config_arg9='-dE'
 PATCHLEVEL=4
-SUBVERSION=69
+SUBVERSION=70
 CONFIG=true
diff --git a/Porting/config_H b/Porting/config_H
index c67ed4ef14..9621d0ff58 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Wed Jul  1 12:34:37 EDT 1998
+ * Configuration time: Mon Jul  6 12:35:32 EDT 1998
  * Configured by     : doughera
  * Target system     : linux fractal 2.0.34 #1 tue jun 23 10:09:17 edt 1998 i686 unknown 
  */
@@ -1787,8 +1787,8 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "/opt/perl/lib/5.00469/i686-linux-thread"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.00469/i686-linux-thread"		/**/
+#define ARCHLIB "/opt/perl/lib/5.00470/i686-linux-thread"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.00470/i686-linux-thread"		/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
@@ -1833,8 +1833,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/opt/perl/lib/5.00469/share"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.00469/share"		/**/
+#define PRIVLIB "/opt/perl/lib/5.00470"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.00470"		/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1849,8 +1849,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/5.00469/i686-linux-thread"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.00469/i686-linux-thread"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.00470/i686-linux-thread"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.00470/i686-linux-thread"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -1865,8 +1865,8 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "/opt/perl/lib/site_perl/5.00469/share"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.00469/share"		/**/
+#define SITELIB "/opt/perl/lib/site_perl/5.00470"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.00470"		/**/
 
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl