From b43c708ad6587be0945a81b1f04142f110ecb471 Mon Sep 17 00:00:00 2001
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Date: Thu, 25 Jul 2019 15:53:40 +0200
Subject: [PATCH] Remove trailing '/' from prefix

Change how/when the trailing '/' from a prefix is removed.

The original code had two problems:

1) it only stripped the trailing slash when value was predefined
   (either from -Dprefix=/foo/bar/ or from a previous configure run)
2) when it did strip the value then it also caused 'oldprefix' to
   be set. This in turns causes other predefined (/cached) paths to
   be ignored.

See https://rt.perl.org/Public/Bug/Display.html?id=134284
---
 Configure | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Configure b/Configure
index 5c02255..3ab45a4 100755
--- a/Configure
+++ b/Configure
@@ -4169,14 +4169,9 @@ EOSC
 
 : determine root of directory hierarchy where package will be installed.
 case "$prefix" in
-'')
-	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
-	;;
-*?/)
-	dflt=`echo "$prefix" | sed 's/.$//'`
+'')	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
 	;;
-*)
-	dflt="$prefix"
+*)	dflt="$prefix"
 	;;
 esac
 $cat <<EOM
@@ -4195,16 +4190,25 @@ rp='Installation prefix to use?'
 . ./getfile
 oldprefix=''
 case "$prefix" in
-'') ;;
-*)
-	case "$ans" in
+'')	;;
+*)	case "$ans" in
 	"$prefix") ;;
 	*) oldprefix="$prefix";;
 	esac
 	;;
 esac
-prefix="$ans"
-prefixexp="$ansexp"
+
+case "$ans" in
+*?/)	prefix=`echo "$ans" | sed 's/.$//'`
+	;;
+*)	prefix="$ans"
+esac
+
+case "$ansexp" in
+*?/)	prefixexp=`echo "$ansexp" | sed 's/.$//'`
+	;;
+*)	prefixexp="$ansexp"
+esac
 
 : allow them to override the AFS root
 case "$afsroot" in
-- 
1.8.3.1