mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-16 05:55:45 +00:00
30f7287119
* accidentally dropped in: https://git.openembedded.org/meta-openembedded/commit/?id=acfdff6e41f860b31faefb4e449239a6d04d7502 Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Tue, 16 Aug 2011 16:04:35 +0200
|
|
Subject: [PATCH] Upstream: not yet
|
|
|
|
Fix configure to accept "--prefix=" (a blank prefix).
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
build/make/configure.sh | 20 ++++++++++++++++----
|
|
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index b645a666f..0b99a8b38 100644
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -658,6 +658,8 @@ process_common_cmdline() {
|
|
;;
|
|
--prefix=*)
|
|
prefix="${optval}"
|
|
+ # Distinguish between "prefix not set" and "prefix set to ''"
|
|
+ prefixset=1
|
|
;;
|
|
--libdir=*)
|
|
libdir="${optval}"
|
|
@@ -687,13 +689,23 @@ process_cmdline() {
|
|
}
|
|
|
|
post_process_common_cmdline() {
|
|
- prefix="${prefix:-/usr/local}"
|
|
+ if [ "$prefixset" != "1" ]
|
|
+ then
|
|
+ prefix=/usr/local
|
|
+ fi
|
|
+
|
|
+ # Strip trailing slash
|
|
prefix="${prefix%/}"
|
|
+
|
|
libdir="${libdir:-${prefix}/lib}"
|
|
libdir="${libdir%/}"
|
|
- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
|
|
- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
|
- fi
|
|
+
|
|
+ case "$libdir" in
|
|
+ "${prefix}/"*) ;;
|
|
+ *)
|
|
+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
|
+ ;;
|
|
+ esac
|
|
}
|
|
|
|
post_process_cmdline() {
|