Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

[ipfire-3.x.git] / dbus / dbus.nm

diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index b96796b7f218bab8e9be51bd2e5aae7c3ce874d5..6bfd2ea6bcbcbfda08b25619d1cd976d64719a6c 100644 (file)
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -5,7 +5,7 @@
 
 name       = dbus
 version    = 1.4.16
-release    = 1
+release    = 2
 
 groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
@@ -31,26 +31,26 @@ build
        configure_options += \
                --sysconfdir=/etc \
                --localstatedir=/var \
-               --libdir=/lib \
-               --libexecdir=/lib \
+               --libdir=/%{lib} \
+               --libexecdir=/%{lib} \
                --enable-libaudit \
                --enable-selinux=yes \
                --with-systemdsystemunitdir=/lib/systemd/system/ \
                --with-dbus-user=dbus
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/usr/lib
-               mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+               mkdir -pv %{BUILDROOT}%{libdir}
+               mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
 
                #change the arch-deps.h include directory to /usr/lib instead of /lib
-               sed -e 's@-I${libdir}@-I${prefix}/lib@' -i %{BUILDROOT}/usr/lib/pkgconfig/dbus-1.pc
+               sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
 
-               mkdir -pv %{BUILDROOT}/usr/lib/dbus-1.0/include
-               mv -v %{BUILDROOT}/lib/dbus-1.0/include/* %{BUILDROOT}/usr/lib/dbus-1.0/include
-               rm -rvf %{BUILDROOT}/lib/dbus-1.0
+               mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include
+               mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include
+               rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
 
-               rm -vf %{BUILDROOT}/lib/libdbus-1.so
-               ln -svf ../../lib/libdbus-1.so.3 %{BUILDROOT}/usr/lib/libdbus-1.so
+               rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so
+               ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so
        end
 end