build-sys: add $usrlibexecdir and fix paths for [/usr]/lib64

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

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 70494abc09e45f10e3e37d842a53fc7638b8037a..9a0497ea59eb334d043de08bf82ea1664ba1bd26 100644 (file)
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -1,6 +1,7 @@
 # The original default vaues of bindir and sbindir:
 usrbinexecdir = ${exec_prefix}/bin
 usrsbinexecdir = ${exec_prefix}/sbin
+usrlibexecdir = ${exec_prefix}/$(libdirname)
 
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\"

diff --git a/configure.ac b/configure.ac
index a4f13d0687989811f67674d2ffcc423a434c8e84..5612f4b4ef1ecd0772e07040f92de3a93840c800 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ BLKID_DATE="10-Feb-2009"
 BLKID_VERSION=$BLKID_VERSION_MAJOR.$BLKID_VERSION_MINOR.$BLKID_VERSION_RELEASE
 BLKID_VERSION_INFO=`expr $BLKID_VERSION_MAJOR + $BLKID_VERSION_MINOR`:$BLKID_VERSION_RELEASE:$BLKID_VERSION_MINOR
 
-
 # Check whether exec_prefix=/usr:
 case $exec_prefix:$prefix in
 NONE:NONE | NONE:/usr | /usr:*)
@@ -41,6 +40,13 @@ NONE:NONE | NONE:/usr | /usr:*)
   esac ;;
 esac
 
+# lib64
+case ${libdir} in
+  *lib64) libdirname=lib64 ;;
+  *) libdirname=lib
+esac
+AC_SUBST([libdirname])
+
 AC_PROG_CC_STDC
 AC_GNU_SOURCE
 AC_CANONICAL_HOST