build-sys: simplify usrlib_execdir initialization

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 8a66b87c04c7cbd77020dfdf8bbe7cdb1c4cdbc0..0825a830d840feb7f7fd0cae5fe8ce82f2fcd373 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,6 @@ case $prefix:$localstatedir in
 esac
 AC_SUBST([localstatedir])
 
-libdirname=`basename "$libdir"`
-AC_SUBST([libdirname])
 
 # The original default values of {bin,sbin,lib}dir
 usrbin_execdir='${exec_prefix}/bin'
@@ -78,7 +76,12 @@ AC_SUBST([usrbin_execdir])
 usrsbin_execdir='${exec_prefix}/sbin'
 AC_SUBST([usrsbin_execdir])
 
-usrlib_execdir='${exec_prefix}/'$libdirname
+case $libdir in
+ '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
+    usrlib_execdir=$libdir ;;
+ *)
+    usrlib_execdir='${exec_prefix}'$libdir ;;
+esac
 AC_SUBST([usrlib_execdir])