X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=autogen.sh;h=ba956694266dbd5f4ce2c65e24a2bcfac74dab20;hb=636c7a44d5143fdca298cb9087a529aa1d71c431;hp=d35e9459eca651dcff725a118793edc7c850d374;hpb=6133f3432fe86bc140cc9ba74794826f75c915fa;p=elogind.git

diff --git a/autogen.sh b/autogen.sh
index d35e9459e..ba9566942 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ MYCFLAGS="-g -Wall \
 -Wnested-externs -Wpointer-arith \
 -Wpointer-arith -Wsign-compare -Wchar-subscripts \
 -Wstrict-prototypes -Wshadow \
--Wformat=2 -Wtype-limits"
+-Wformat-security -Wtype-limits"
 
 case "$CFLAGS" in
 	*-O[0-9]*)
@@ -24,12 +24,12 @@ libdir() {
 
 args="--prefix=/usr \
 --sysconfdir=/etc \
---sbindir=/sbin \
+--bindir=/usr/bin \
+--sbindir=/usr/sbin \
 --libdir=$(libdir /usr/lib) \
---with-rootlibdir=$(libdir /lib) \
---libexecdir=/lib/udev \
+--libexecdir=/usr/lib/udev \
+--with-systemdsystemunitdir=/usr/lib/systemd/system
 --with-selinux \
 --enable-gtk-doc"
 
-export CFLAGS="$CFLAGS $MYCFLAGS"
-./configure $args $@
+./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@