From: Georg Brandl <georg@python.org>
Date: Tue, 31 Mar 2009 21:45:18 +0000 (+0000)
Subject: #1676135: remove trailing slashes from --prefix argument.
X-Git-Tag: v2.7a1~1664
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcd64a3fc727e773d4efac3995faa44cc973bb3d;p=python

#1676135: remove trailing slashes from --prefix argument.
---

diff --git a/configure b/configure
index 328629d351..82542b3b2a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 70479 .
+# From configure.in Revision: 70730 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -1807,6 +1807,11 @@ ac_config_headers="$ac_config_headers pyconfig.h"
 
 
 
+if test "$prefix" != "/"; then
+    prefix=`echo "$prefix" | sed -e 's/\/$//g'`
+fi
+
+
 
 
 
diff --git a/configure.in b/configure.in
index acfec69dd7..69ae036dde 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,15 @@ AC_INIT(python, PYTHON_VERSION, http://www.python.org/python-bugs)
 AC_CONFIG_SRCDIR([Include/object.h])
 AC_CONFIG_HEADER(pyconfig.h)
 
+dnl Ensure that if prefix is specified, it does not end in a slash. If
+dnl it does, we get path names containing '//' which is both ugly and
+dnl can cause trouble.
+
+dnl Last slash shouldn't be stripped if prefix=/
+if test "$prefix" != "/"; then
+    prefix=`echo "$prefix" | sed -e 's/\/$//g'`
+fi    
+
 dnl This is for stuff that absolutely must end up in pyconfig.h.
 dnl Please use pyport.h instead, if possible.
 AH_TOP([