From 05768003f7e2272788fb9c25a4c5ccc73abf72b3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 16 Mar 2013 07:43:54 +0000 Subject: [PATCH] Set INSTALLDIRS on both make and make install rules. --- libguestfs.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index dc81aa1..e55b21f 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.21.21 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -773,7 +773,9 @@ make check -k %install -make DESTDIR=$RPM_BUILD_ROOT install +# 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the +# vendor dir not the site dir. +make DESTDIR=$RPM_BUILD_ROOT INSTALLDIRS=vendor install # Delete static libraries, libtool files. rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a @@ -1028,6 +1030,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog +* Sat Mar 16 2013 Richard W.M. Jones - 1:1.21.21-2 +- Set INSTALLDIRS on both make and make install rules. + * Fri Mar 15 2013 Richard W.M. Jones - 1:1.21.21-1 - New upstream version 1.21.21. - Remove ruby vendor patch.