]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
dbus-glib: Make package work on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 15:01:35 +0000 (16:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 15:01:35 +0000 (16:01 +0100)
dbus-glib/dbus-glib.nm

index 8054c6d37ed4467cf20d1d0c964c31b0253d463c..59d6680f425a7b0494a8f468319864690ae2b840 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = dbus-glib
 version    = 0.94
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.freedesktop.org/software/dbus/
@@ -30,8 +30,8 @@ build
 
        configure_options += \
                --sysconfdir=/etc \
-               --libdir=/lib \
-               --libexecdir=/usr/lib \
+               --libdir=/%{lib} \
+               --libexecdir=%{libdir} \
                --mandir=/usr/share/man
 
        test
@@ -39,10 +39,10 @@ build
        end
 
        install_cmds
-               mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+               mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
 
-               rm -vf %{BUILDROOT}/lib/libdbus-glib-1.so
-               ln -svf ../../lib/libdbus-glib-1.so.2 %{BUILDROOT}/usr/lib/libdbus-glib-1.so
+               rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so
+               ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so
        end
 end