--- a/Make.common	2018-05-27 22:56:49.564527567 +0100
+++ b/Make.common	2018-05-27 23:10:22.681242272 +0100
@@ -17,10 +17,11 @@
 # used to compile rEFInd....
 #
 
+LIBDIR          ?= /usr/lib
 EFIINC          = /usr/include/efi
-GNUEFILIB       = /usr/lib
-EFILIB          = /usr/lib
-EFICRT0         = /usr/lib
+GNUEFILIB       = $(LIBDIR)
+EFILIB          = $(LIBDIR)
+EFICRT0         = $(LIBDIR)/gnuefi
 
 # Comment out above and uncomment below if using locally-compiled GNU-EFI....
 #EFIINC          = /usr/local/include/efi
--- a/refind-install	2018-12-16 17:14:36.990090411 +0000
+++ b/refind-install	2018-12-16 17:16:34.123509414 +0000
@@ -1136,8 +1136,8 @@
 } # ReSignBinaries()
 
 # Locate and mount an ESP, if possible, based on parted output.
-# Should be called only if /boot/efi is NOT an acceptable ESP.
-# Sets InstallDir to the mounted ESP's path ($RootDir/boot/efi)
+# Should be called only if /boot/EFI is NOT an acceptable ESP.
+# Sets InstallDir to the mounted ESP's path ($RootDir/boot/EFI)
 # and EspFilesystem the filesystem (always "vfat")
 FindLinuxESP() {
    echo "The ESP doesn't seem to be mounted! Trying to find it...."
@@ -1163,10 +1163,10 @@
       if [[ $TableType == 'gpt' && $SkipIt == 0 ]] ; then # read only GPT disks that aren't part of dmraid array
          PartNum=`LANG=C parted $Drive print -m -s 2>/dev/null | awk -F: '$7 ~ "(^boot| boot)" { print $1 }' | head -n 1`
          if [ "$PartNum" -eq "$PartNum" ] 2> /dev/null ; then
-            InstallDir="$RootDir/boot/efi"
+            InstallDir="$RootDir/boot/EFI"
             mkdir -p $InstallDir
             mount $Drive$PartNum $InstallDir
-            EspFilesystem=`grep "$Drive$PartNum.*/boot/efi" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3`
+            EspFilesystem=`grep "$Drive$PartNum.*/boot/EFI" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3`
             if [[ $EspFilesystem != 'vfat' ]] ; then
                umount $InstallDir
             else
@@ -1178,17 +1178,17 @@
    done
 } # FindLinuxESP()
 
-# Identifies the ESP's location (/boot or /boot/efi, or these locations under
+# Identifies the ESP's location (/boot or /boot/EFI, or these locations under
 # the directory specified by --root); aborts if the ESP isn't mounted at
 # either location.
 # Sets InstallDir to the ESP mount point.
 FindMountedESP() {
    mount /boot &> /dev/null
-   mount /boot/efi &> /dev/null
+   mount /boot/EFI &> /dev/null
    mount /efi &> /dev/null
    EspLine=`df "$RootDir/efi" 2> /dev/null | grep efi`
    if [[ ! -n "$EspLine" ]] ; then
-      EspLine=`df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi`
+      EspLine=`df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI`
    fi
    if [[ ! -n "$EspLine" ]] ; then
       EspLine=`df "$RootDir"/boot 2> /dev/null | grep boot`
@@ -1203,7 +1203,7 @@
    fi
    if [[ $EspFilesystem != 'vfat' ]] ; then
       echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be"
-      echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!"
+      echo "mounted at $RootDir/boot or $RootDir/boot/EFI and it must be VFAT! Aborting!"
       if [[ -d /sys/firmware/efi ]] ; then
          exit 1
       else