Set INSTALLDIRS on both make and make install rules.

This commit is contained in:
Richard W.M. Jones 2013-03-16 07:43:54 +00:00
parent 18ed3aa421
commit 05768003f7

View File

@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.21.21 Version: 1.21.21
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -773,7 +773,9 @@ make check -k
%install %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. # Delete static libraries, libtool files.
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
@ -1028,6 +1030,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog %changelog
* Sat Mar 16 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.21-2
- Set INSTALLDIRS on both make and make install rules.
* Fri Mar 15 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.21-1 * Fri Mar 15 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.21-1
- New upstream version 1.21.21. - New upstream version 1.21.21.
- Remove ruby vendor patch. - Remove ruby vendor patch.