From c0bfa22a5aa4d98c2ab582e24254bb135e32e3af Mon Sep 17 00:00:00 2001 From: DoctorNoobingstoneIPresume Date: Sat, 2 Sep 2023 17:24:26 +0300 Subject: [PATCH] configure: Directory pathnames may now contain the equals sign. The user is allowed to specify directory pathnames using --prefix=PATHNAME etc., but the extraction of the PATHNAME used to use a regex which eliminated everything until the last equals sign. We have switched to eliminating everything until the first equals sign. --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 7aaf5dfa3..4e4047134 100755 --- a/configure +++ b/configure @@ -119,12 +119,12 @@ case "$1" in echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log exit 0 ;; - -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;; - -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;; - -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;; - --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;; - -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;; - -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;; + -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[^=]*=//'`; shift ;; + -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[^=]*=//'`; shift ;; + -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[^=]*=//'`; shift ;; + --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/[^=]*=//'`; shift ;; + -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[^=]*=//'`;shift ;; + -u*=* | --uname=*) uname=`echo $1 | sed 's/[^=]*=//'`;shift ;; -p* | --prefix) prefix="$2"; shift; shift ;; -e* | --eprefix) exec_prefix="$2"; shift; shift ;; -l* | --libdir) libdir="$2"; shift; shift ;; @@ -135,7 +135,7 @@ case "$1" in --cover) cover=1; shift ;; -z* | --zprefix) zprefix=1; shift ;; -6* | --64) build64=1; shift ;; - -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;; + -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/[^=]*=//'`; shift ;; --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;; --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;; -c* | --const) zconst=1; shift ;;