From: Kevin Day <thekevinday@gmail.com>
Date: Sun, 28 Jul 2019 22:02:49 +0000 (-0500)
Subject: Bugfix: install script destination parameters not being respected
X-Git-Tag: 0.5.0~497
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=e65c62af80435fd49e8713ebe2f5a4d823e2b52a;p=fll

Bugfix: install script destination parameters not being respected

I used the wrong name in the grab_next variable when designating to grab the next includedir and libdir.
There is also a mistake where I was copying the destination_prefix onto itself.
---

diff --git a/build/scripts/install.sh b/build/scripts/install.sh
index 290cc9a..568dceb 100644
--- a/build/scripts/install.sh
+++ b/build/scripts/install.sh
@@ -78,9 +78,9 @@ install_main(){
         elif [[ $p == "-B" || $p == "--bindir" ]] ; then
           grab_next=bindir
         elif [[ $p == "-I" || $p == "--includedir" ]] ; then
-          grab_next=includes
+          grab_next=includedir
         elif [[ $p == "-L" || $p == "--libdir" ]] ; then
-          grab_next=libraries
+          grab_next=libdir
         elif [[ $p == "--enable-shared" ]] ; then
           enable_shared="yes"
         elif [[ $p == "--disable-shared" ]] ; then
@@ -138,10 +138,6 @@ install_main(){
     fi
 
     if [[ $destination_prefix != "" ]] ; then
-      if [[ $(echo $destination_prefix | grep -o '^/') == "" ]] ; then
-        destination_prefix="$destination_prefix$destination_prefix"
-      fi
-
       if [[ $(echo $destination_programs | grep -o '^/') == "" ]] ; then
         destination_programs="$destination_prefix$destination_programs"
       fi