autogen: add --with-rootlibdir= and switch /usr/local to /usr

diff --git a/autogen.sh b/autogen.sh
index 60a0286ac64db00d8425b04e5dd81d7576833398..3b9dd1fd166626e4f7fde0c6e3b2ca6c7142c5ac 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -68,11 +68,12 @@ else
 
     if [ "x$1" != "xac" ]; then
         CFLAGS="$CFLAGS -g -O0" ./configure \
+          --with-rootprefix= \
           --sysconfdir=/etc \
           --localstatedir=/var \
+          --libdir=$(libdir /usr/lib) \
+          --with-rootlibdir=$(libdir /lib) \
           --libexecdir=/usr/lib \
-          --libdir=$(libdir /usr/local/lib) \
-          --with-rootprefix= \
           "$@"
         make clean
     fi

diff --git a/configure.ac b/configure.ac
index 4c8b1156743f733a7eaf87ee547093e1ed34cc51..ef9bfc17d35913a293862d7fc07d71dad1f105f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -649,6 +649,7 @@ AC_MSG_RESULT([
         plymouth:                ${have_plymouth}
         prefix:                  ${prefix}
         rootprefix:              ${with_rootprefix}
+        libexec dir:             ${libexecdir}
         lib dir:                 ${libdir}
         rootlib dir:             ${with_rootlibdir}
         pam modules dir:         ${with_pamlibdir}