From 07ab5ca2a97e596761773adf56fa8357d4e7bd7b Mon Sep 17 00:00:00 2001
From: Keshav Amburay <the.ridikulus.rat@gmail.com>
Date: Tue, 10 Apr 2012 19:40:23 +0530
Subject: [PATCH] Use /EFI/arch/ , not /EFI/arch_

---
 .SRCINFO             | 2 +-
 PKGBUILD             | 8 ++++----
 elilo-x86_64.install | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 669e84ff8be6..05d329032899 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = elilo-x86_64
 	options = purge
 	options = !libtool
 	options = !emptydirs
-	backup = boot/efi/efi/arch_elilo/elilo.conf
+	backup = boot/efi/efi/arch/elilo/elilo.conf
 	source = http://downloads.sourceforge.net/project/elilo/elilo/elilo-3.14/elilo-3.14-all.tar.gz
 	source = elilo.conf.example
 	sha1sums = 631fdf211627510b270f0759c26587edb8d30001
diff --git a/PKGBUILD b/PKGBUILD
index ad739c73294f..8899eaaa36a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ depends=('dosfstools' 'efibootmgr')
 options=('!strip' 'purge' '!libtool' '!emptydirs')
 
 install="${pkgname}.install"
-backup=("boot/efi/efi/arch_elilo/elilo.conf")
+backup=("boot/efi/efi/arch/elilo/elilo.conf")
 
 source=("http://downloads.sourceforge.net/project/elilo/elilo/elilo-${pkgver}/elilo-${pkgver}-all.tar.gz"
         "elilo.conf.example")
@@ -56,9 +56,9 @@ package() {
 	
 	cd "${srcdir}/elilo/"
 	
-	install -d "${pkgdir}/boot/efi/efi/arch_elilo/"
-	install -D -m0644 "${srcdir}/elilo/elilo.efi" "${pkgdir}/boot/efi/efi/arch_elilo/elilox64.efi"
-	install -D -m0644 "${srcdir}/elilo.conf.example" "${pkgdir}/boot/efi/efi/arch_elilo/elilo.conf"
+	install -d "${pkgdir}/boot/efi/efi/arch/elilo/"
+	install -D -m0644 "${srcdir}/elilo/elilo.efi" "${pkgdir}/boot/efi/efi/arch/elilo/elilox64.efi"
+	install -D -m0644 "${srcdir}/elilo.conf.example" "${pkgdir}/boot/efi/efi/arch/elilo/elilo.conf"
 	
 	# install -d "${pkgdir}/usr/sbin/"
 	# install -D -m0755 "${srcdir}/elilo/tools/eliloalt" "${pkgdir}/usr/sbin/eliloalt"
diff --git a/elilo-x86_64.install b/elilo-x86_64.install
index 75416e7fd983..773241542dbe 100644
--- a/elilo-x86_64.install
+++ b/elilo-x86_64.install
@@ -4,11 +4,11 @@ post_install() {
 
 Important instructions :-
 
-ELILO is installed at /boot/efi/efi/arch_elilo/elilox64.efi
+ELILO is installed at /boot/efi/efi/arch/elilo/elilox64.efi
 
-An example config file has been provided at /boot/efi/efi/arch_elilo/elilo.conf
+An example config file has been provided at /boot/efi/efi/arch/elilo/elilo.conf
 
-Edit this file according to your system and rename it as /boot/efi/efi/arch_elilo/elilo.conf 
+Edit this file according to your system and rename it as /boot/efi/efi/arch/elilo/elilo.conf 
 Copy your kernel(s) and initramfs files from /boot to /boot/efi
 Reboot and launch elilox64.efi from the UEFI shell or add an entry using efibootmgr