Thu Jul 25 01:44:55 PDT 2013

2 files changed, 24 insertions, 30 deletions

diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 21188dee0..5b7826717 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190825 2013-07-18 07:06:20Z tpowa $
+# $Id: PKGBUILD 191365 2013-07-24 10:47:59Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,7 +17,7 @@ _COMPILER="GCC46"
 
 pkgname="refind-efi"
 pkgver="0.7.1"
-pkgrel="3"
+pkgrel="4"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
@@ -181,16 +181,16 @@ build() {
 package() {
 	
 	msg "Install the rEFInd UEFI application"
-	install -d "${pkgdir}/usr/lib/refind/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi"
+	install -d "${pkgdir}/usr/share/refind/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/refind_${_TIANO_S_ARCH}.efi"
 	
 	msg "Install UEFI drivers built from rEFInd"
-	install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/"
+	install -d "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/"
 	
 	msg "Install UEFI applications built from rEFInd"
-	install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi"
+	install -d "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi"
 	
 	msg "Install rEFInd helper scripts"
 	install -d "${pkgdir}/usr/bin/"
@@ -200,17 +200,17 @@ package() {
 	install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
 	
 	msg "Install the rEFInd sample config files"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/refind.conf-sample"
-	install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/refind_linux.conf-sample"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/share/refind/refind.conf-sample"
+	install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/share/refind/refind_linux.conf-sample"
 	
 	msg "Install the rEFInd docs"
-	install -d "${pkgdir}/usr/share/doc/refind/html/"
-	install -d "${pkgdir}/usr/share/doc/refind/Styles/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/doc/refind/html/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/doc/refind/Styles/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/doc/refind/README"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/doc/refind/NEWS"
-	rm -f "${pkgdir}/usr/share/doc/refind/html/.DS_Store" || true
+	install -d "${pkgdir}/usr/share/refind/docs/html/"
+	install -d "${pkgdir}/usr/share/refind/docs/Styles/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt"
+	rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true
 	
 	msg "Install the rEFInd fonts"
 	install -d "${pkgdir}/usr/share/refind/fonts/"
@@ -236,15 +236,9 @@ package() {
 	msg "Use '#!/usr/bin/env bash' in all scripts"
 	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true
 	
-	msg "Point refind dir paths to /usr/lib/refind/ in refind-install script"
-	sed 's|^ThisDir=.*|ThisDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
-	sed 's|^RefindDir=.*|RefindDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
+	msg "Point refind dir paths to /usr/share/refind/ in refind-install script"
+	sed 's|^ThisDir=.*|ThisDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
+	sed 's|^RefindDir=.*|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
 	sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install"
 	
-	msg "Setup SYMLINKS to refind dirs for the sake of refind-install script"
-	ln -s "/usr/share/refind/fonts" "${pkgdir}/usr/lib/refind/fonts"
-	ln -s "/usr/share/refind/icons" "${pkgdir}/usr/lib/refind/icons"
-	ln -s "/usr/share/refind/keys" "${pkgdir}/usr/lib/refind/keys"
-	ln -s "/usr/share/doc/refind" "${pkgdir}/usr/lib/refind/docs"
-	
 }
diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install
index 011552bcd..947d157e3 100644
--- a/extra/refind-efi/refind-efi.install
+++ b/extra/refind-efi/refind-efi.install
@@ -2,14 +2,14 @@ post_install() {
 	
 	cat << EOF 
 
-rEFInd UEFI application has been installed at /usr/lib/refind/refind_*.efi
+rEFInd UEFI application has been installed at /usr/share/refind/refind_*.efi
 
-Other UEFI applications have been installed at /usr/lib/refind/tools_*/
+Other UEFI applications have been installed at /usr/share/refind/tools_*/
 
-UEFI drivers have deen installed at /usr/lib/refind/drivers_*/
+UEFI drivers have deen installed at /usr/share/refind/drivers_*/
 
 Copy the efi application (according to your UEFI ARCH) 
-and /usr/lib/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/
+and /usr/share/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/
 as refind.conf and add an entry to firmware boot menu using efibootmgr
 or mactel-boot (for Macs)