diff --git a/libnl/PKGBUILD b/libnl/PKGBUILD index dbfc81809..837f7c93a 100644 --- a/libnl/PKGBUILD +++ b/libnl/PKGBUILD @@ -11,7 +11,7 @@ pkgdesc="Library for applications dealing with netlink sockets" arch=('x86_64') license=('GPL') depends=('glibc') -conflict=('libnl3') +conflicts=('libnl3') backup=('etc/libnl/classid' 'etc/libnl/pktloc') options=(!libtool) source=("http://www.infradead.org/~tgr/libnl/files/$pkgname-$pkgver.tar.gz") diff --git a/wpa_supplicant/PKGBUILD b/wpa_supplicant/PKGBUILD index 41a03f1b9..b739d6dde 100644 --- a/wpa_supplicant/PKGBUILD +++ b/wpa_supplicant/PKGBUILD @@ -23,7 +23,7 @@ build() { cp "${srcdir}/config" ./.config sed -i 's@/usr/local@$(PREFIX)@g' Makefile - make + make PREFIX=/usr } package() { @@ -39,7 +39,7 @@ package() { install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" - sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service + install -m755 -d "${pkgdir}/etc/dbus-1/system.d" install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"