1*4882a593SmuzhiyunFrom dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Koen Kooi <koen@dominion.thruhere.net> 3*4882a593SmuzhiyunDate: Tue, 16 Aug 2011 16:04:35 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Upstream: not yet 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFix configure to accept "--prefix=" (a blank prefix). 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun build/make/configure.sh | 20 ++++++++++++++++---- 10*4882a593Smuzhiyun 1 file changed, 16 insertions(+), 4 deletions(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/build/make/configure.sh b/build/make/configure.sh 13*4882a593Smuzhiyunindex 007e020..04d5cbf 100644 14*4882a593Smuzhiyun--- a/build/make/configure.sh 15*4882a593Smuzhiyun+++ b/build/make/configure.sh 16*4882a593Smuzhiyun@@ -581,6 +581,8 @@ process_common_cmdline() { 17*4882a593Smuzhiyun ;; 18*4882a593Smuzhiyun --prefix=*) 19*4882a593Smuzhiyun prefix="${optval}" 20*4882a593Smuzhiyun+ # Distinguish between "prefix not set" and "prefix set to ''" 21*4882a593Smuzhiyun+ prefixset=1 22*4882a593Smuzhiyun ;; 23*4882a593Smuzhiyun --libdir=*) 24*4882a593Smuzhiyun libdir="${optval}" 25*4882a593Smuzhiyun@@ -614,13 +616,23 @@ process_cmdline() { 26*4882a593Smuzhiyun } 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun post_process_common_cmdline() { 29*4882a593Smuzhiyun- prefix="${prefix:-/usr/local}" 30*4882a593Smuzhiyun+ if [ "$prefixset" != "1" ] 31*4882a593Smuzhiyun+ then 32*4882a593Smuzhiyun+ prefix=/usr/local 33*4882a593Smuzhiyun+ fi 34*4882a593Smuzhiyun+ 35*4882a593Smuzhiyun+ # Strip trailing slash 36*4882a593Smuzhiyun prefix="${prefix%/}" 37*4882a593Smuzhiyun+ 38*4882a593Smuzhiyun libdir="${libdir:-${prefix}/lib}" 39*4882a593Smuzhiyun libdir="${libdir%/}" 40*4882a593Smuzhiyun- if [ "${libdir#${prefix}}" = "${libdir}" ]; then 41*4882a593Smuzhiyun- die "Libdir ${libdir} must be a subdirectory of ${prefix}" 42*4882a593Smuzhiyun- fi 43*4882a593Smuzhiyun+ 44*4882a593Smuzhiyun+ case "$libdir" in 45*4882a593Smuzhiyun+ "${prefix}/"*) ;; 46*4882a593Smuzhiyun+ *) 47*4882a593Smuzhiyun+ die "Libdir ${libdir} must be a subdirectory of ${prefix}" 48*4882a593Smuzhiyun+ ;; 49*4882a593Smuzhiyun+ esac 50*4882a593Smuzhiyun } 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun post_process_cmdline() { 53