Use /lib/efi/{x32,x64} for storing EFI binaries

- /lib seems better than /usr/lib for such lowlevel services, separate
  /usr is considered obsolete anyway.
- do not use /lib64 for 64-bit binaries, as /libx64 is not available on
  32-bit PLD, but 64-bit EFI binaries may be needed to boot 32-bit PLD
  from a 64-bit EFI platform. Instead x32 and x64 subdirectories are
  provided ('x64', 'x32' is the notation often used in EFI environmnet)

diff --git a/efi-boot-update.spec b/efi-boot-update.spec
index c229f2f0e30a39d2b08df8702c66889d744e0034..cba2ebfc4fbdbb2c8f8b2e5edecee579864c388d 100644 (file)
--- a/efi-boot-update.spec
+++ b/efi-boot-update.spec
@@ -35,7 +35,7 @@ help2man --no-info ./%{name} > %{name}.8
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/efi-boot/update.d
-install -d $RPM_BUILD_ROOT{%{_prefix}/lib{,64}/efi,%{_sbindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{/lib/efi/{x32,x64},%{_sbindir},%{_mandir}/man8}
 
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
@@ -60,8 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/efi-boot/update.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/efi-boot/update.d/*.conf
 %dir /etc/efi-boot/update.d
-%dir %{_libdir}/efi
-%if "%{_libdir}" != "%{_prefix}/lib"
-%dir %{_prefix}/lib/efi
-%endif
+%dir /lib/efi
+%dir /lib/efi/x32
+%dir /lib/efi/x64
 %{_mandir}/man8/%{name}.8*