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