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

diff --git a/autogen.sh b/autogen.sh
index 5c5903e0e..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]*)
@@ -18,10 +18,18 @@ case "$CFLAGS" in
 		;;
 esac
 
-libdirname=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
-args="--prefix=/usr --exec-prefix= --sysconfdir=/etc \
---libdir=/usr/$libdirname --with-libdir-name=$libdirname \
---with-selinux --enable-gtk-doc"
+libdir() {
+	echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
 
-export CFLAGS="$CFLAGS $MYCFLAGS"
-./configure $args $@
+args="--prefix=/usr \
+--sysconfdir=/etc \
+--bindir=/usr/bin \
+--sbindir=/usr/sbin \
+--libdir=$(libdir /usr/lib) \
+--libexecdir=/usr/lib/udev \
+--with-systemdsystemunitdir=/usr/lib/systemd/system
+--with-selinux \
+--enable-gtk-doc"
+
+./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@