summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-01-05 17:57:02 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-01-05 17:57:02 +0100
commitfbe224e2032cfbd9ea664a64c5254756ce5b5448 (patch)
treef4adc124c7a6c2794322985baf85443ec1fff3ce
parent124e6fb56d8aa4e1244625cedc6033ebcda575ed (diff)
autogen: add --with-rootlibdir= and switch /usr/local to /usr
-rwxr-xr-xautogen.sh5
-rw-r--r--configure.ac1
2 files changed, 4 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index 60a0286ac6..3b9dd1fd16 100755
--- 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 4c8b115674..ef9bfc17d3 100644
--- 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}