Run 'make install' twice.

This commit is contained in:
Richard W.M. Jones 2010-05-25 23:31:18 +00:00
parent 199753ba03
commit bdeaeafcc6

View File

@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.3.16
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -425,15 +425,6 @@ export PATH=/usr/sbin:$PATH
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
# not the site dir.
# Run 'make' a number of times because of:
# /usr/bin/perl Makefile.PL "INSTALLDIRS=vendor" "PREFIX=/usr"
# Warning: -L../src/.libs changed to -L..../perl/../src/.libs
# Writing Makefile-pl for Sys::Guestfs
# ==> Your Makefile has been rebuilt. <==
# ==> Please rerun the make command. <==
make INSTALLDIRS=vendor %{?_smp_mflags} ||:
make INSTALLDIRS=vendor %{?_smp_mflags} ||:
make INSTALLDIRS=vendor %{?_smp_mflags} ||:
make INSTALLDIRS=vendor %{?_smp_mflags}
# Useful for debugging appliance problems.
@ -503,6 +494,13 @@ make check
%install
rm -rf $RPM_BUILD_ROOT
# Run 'make install' a number of times because of:
# /usr/bin/perl Makefile.PL "INSTALLDIRS=vendor" "PREFIX=/usr"
# Warning: -L../src/.libs changed to -L..../perl/../src/.libs
# Writing Makefile-pl for Sys::Guestfs
# ==> Your Makefile has been rebuilt. <==
# ==> Please rerun the make command. <==
make DESTDIR=$RPM_BUILD_ROOT install ||:
make DESTDIR=$RPM_BUILD_ROOT install
# Delete the ordinary appliance, leaving just the supermin appliance.
@ -702,7 +700,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue May 25 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.16-3
* Tue May 25 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.16-4
- New upstream version 1.3.16.
- Add guestfish bash tab completion script.