| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame] | 1 | From e81633a276dd6a9f919e5e5c15481ac50a8e485d Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Fri, 30 Aug 2019 14:59:06 +0800 |
| 4 | Subject: [PATCH] support usrmerge |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe-specific] |
| 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 9 | --- |
| 10 | configure.ac | 7 +++---- |
| 11 | 1 file changed, 3 insertions(+), 4 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index 4b7e4c8..f1afbd6 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -110,8 +110,7 @@ AC_ARG_ENABLE(libicu, |
| 18 | # If the user specified a libdir ending in lib64 do not append another |
| 19 | # 64 to the library names. |
| 20 | # |
| 21 | -base_libdir=`basename "$libdir"` |
| 22 | -case $base_libdir in |
| 23 | +case `basename "$libdir"` in |
| 24 | lib64) |
| 25 | enable_lib64=no |
| 26 | esac |
| 27 | @@ -125,8 +124,8 @@ esac |
| 28 | # |
| 29 | case $exec_prefix:$prefix in |
| 30 | NONE:NONE | NONE:/usr | /usr:*) |
| 31 | - root_sbindir='/sbin' |
| 32 | - root_libdir="/${base_libdir}" |
| 33 | + root_sbindir="${base_sbindir}" |
| 34 | + root_libdir="${base_libdir}" |
| 35 | ;; |
| 36 | *) |
| 37 | root_sbindir="${sbindir}" |
| 38 | -- |
| 39 | 2.7.4 |
| 40 | |