- Fix install paths on x86_64.

gnu-efi.spec

@@ -1,15 +1,16 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0e
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/System
 License: GPLv2+
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.bz2
 Patch0: gnu-efi-3.0e-no-relocations.patch
-Patch1: gnu-efi-3.0d-unwrap.patch
-Patch2: gnu-efi-3.0d-uefi_wrap.patch
-Patch3: gnu-efi-3.0d-uefi_wrap_call10.patch
+Patch1: gnu-efi-3.0e-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
+Patch2: gnu-efi-3.0d-unwrap.patch
+Patch3: gnu-efi-3.0d-uefi_wrap.patch
+Patch4: gnu-efi-3.0d-uefi_wrap_call10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 x86_64
 
@@ -20,12 +21,13 @@ applications that run under EFI (Extensible Firmware Interface).
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # these are currently disabled as we don't need them per se, and they
 # haven't gone upstream yet either.  Also #2 and #3 haven't been updated
 # to work with gnu-efi-3.0e yet.
-#%%patch1 -p1
 #%%patch2 -p1
 #%%patch3 -p1
+#%%patch4 -p1
 
 %build
 # Package cannot build with %{?_smp_mflags}.
@@ -36,7 +38,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/%{_libdir}
 
-make INSTALLROOT=%{buildroot}/%{_prefix} install
+make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install
 
 mkdir -p %{buildroot}/%{_libdir}/gnuefi
 mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_libdir}/gnuefi
@@ -53,6 +55,9 @@ rm -rf %{buildroot}
 %{_libdir}/*
 
 %changelog
+* Fri Oct 03 2008 Peter Jones <pjones@redhat.com> - 3.0e-2
+- Fix install paths on x86_64.
+
 * Thu Oct 02 2008 Peter Jones <pjones@redhat.com> - 3.0e-1
 - Update to 3.0e
 - Fix relocation bug in 3.0e