Browse files

Use "make install" instead of a direct "install" when building the RPM

We can also set up a macro for plugindir to not seem like savages.
  • Loading branch information...
1 parent 3b7c7ff commit 50b5b49a2f667d2d89c321b461d349214a581af7 @dm0- committed Mar 29, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 pidgin-window_merge.spec
View
9 pidgin-window_merge.spec
@@ -1,5 +1,4 @@
Name: pidgin-window_merge
-%global pname %(echo -n %{name} | sed s/^pidgin-//)
Version: 0.2
Release: 1%{?dist}
Summary: Merges the Buddy List window with a conversation window
@@ -12,6 +11,9 @@ Source0: https://github.com/downloads/dm0-/window_merge/window_merge-0.2.t
BuildRequires: pidgin-devel
Requires: pidgin
+%global pname %(echo -n %{name} | sed s/^pidgin-//)
+%global plugindir %(pkg-config --variable=plugindir pidgin)
+
%description
Enabling this plugin will allow conversations to be attached to the Buddy List
window. Preferences are available to customize the plugin's panel layout.
@@ -25,11 +27,12 @@ window. Preferences are available to customize the plugin's panel layout.
make %{?_smp_mflags}
%install
-install -Dpm 755 .libs/%{pname}.so %{buildroot}%{_libdir}/pidgin/%{pname}.so
+make install DESTDIR=%{buildroot} plugindir=%{plugindir}
+rm -f %{buildroot}%{plugindir}/%{pname}.la
%files
-%{_libdir}/pidgin/%{pname}.so
+%{plugindir}/%{pname}.so
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO

0 comments on commit 50b5b49

Please sign in to comment.