From 7303ecc364029f31b3e43de7b8633ff43466941b Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 18 Mar 2000 17:11:07 +0000
Subject: [PATCH] Configure nits: rewording from Sarathy (aka #5796), and
 installation directories patch from Robin Barker.

p4raw-id: //depot/metaconfig@5802
---
 U/modified/Getfile.U   | 12 +++++++-----
 U/perl/bincompat5005.U | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/U/modified/Getfile.U b/U/modified/Getfile.U
index f7d7cc8..77d801a 100644
--- a/U/modified/Getfile.U
+++ b/U/modified/Getfile.U
@@ -87,7 +87,7 @@
 ?V:ansexp:fn gfpth gfpthkeep
 ?F:./getfile
 ?T:tilde type what orig_rp orig_dflt fullpath already redo skip none_ok \
-	value exp_file nopath_ok loc_file fp pf
+	value exp_file nopath_ok loc_file fp pf direxp
 ?LINT:change ans
 ?LINT:change gfpth
 : now set up to get a file name
@@ -265,13 +265,15 @@ while test "$type"; do
 			Directory)
 				for fp in $gfpth; do
 					if test "X$fp" = X.; then
-					    pf="$ansexp"
+					    dir="$ans"
+					    direxp="$ansexp"
 					else    
-					    pf="$fp/$ansexp"
+					    dir="$fp/$ans"
+					    direxp="$fp/$ansexp"
 					fi
-					if test -d "$pf"; then
+					if test -d "$direxp"; then
 						type=''
-						value="$pf"
+						value="$dir"
 						break
 					fi
 				done
diff --git a/U/perl/bincompat5005.U b/U/perl/bincompat5005.U
index 404feed..8b60217 100644
--- a/U/perl/bincompat5005.U
+++ b/U/perl/bincompat5005.U
@@ -8,17 +8,18 @@
 ?MAKE:	-pick add $@ %<
 ?Y:TOP
 ?S:bincompat5005:
-?S:	This variable contains y if Perl 5.006 should be binary-compatible
-?S:	with Perl 5.005.
+?S:	This variable contains y if this version of Perl should be
+?S:	binary-compatible with Perl 5.005.
 ?S:.
 ?S:d_bincompat5005:
 ?S:	This variable conditionally defines BINCOMPAT5005 so that embed.h
-?S:	can take special action if Perl 5.006 should be binary-compatible
-?S:	with Perl 5.005.  This is impossible for builds that use features
-?S:	like threads and multiplicity it is always $undef for those versions.
+?S:	can take special action if this version of Perl should be
+?S:	binary-compatible with Perl 5.005.  This is impossible for builds
+?S:	that use features like threads and multiplicity it is always $undef
+?S:	for those versions.
 ?S:.
 ?C:PERL_BINCOMPAT_5005:
-?C:	This symbol, if defined, indicates that Perl 5.006 should be
+?C:	This symbol, if defined, indicates that this version of Perl should be
 ?C:	binary-compatible with Perl 5.005.  This is impossible for builds
 ?C:	that use features like threads and multiplicity it is always $undef
 ?C:	for those versions.
@@ -36,9 +37,9 @@ case "$usethreads$usemultiplicity" in
 	;;
 *)	$cat <<EOM
 
-Perl 5.006 can be compiled for binary compatibility with 5.005.
-If you decide to do so, you will be able to continue using most
-of the extensions that were compiled for Perl 5.005.
+This version of Perl can be compiled for binary compatibility with 5.005.
+If you decide to do so, you will be able to continue using most of the
+extensions that were compiled for Perl 5.005.
 
 EOM
 	case "$bincompat5005$d_bincompat5005" in
-- 
1.8.3.1