Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade

Conflicts: www/application/controllers/Auth.php
2020-02-08 00:39:03 -05:00
parent 275e53d319 78381960f4
commit 31a7cb3508
16 changed files with 357 additions and 243 deletions
@@ -75,22 +75,22 @@ build=x86_64-unknown-linux-gnu
 build_os=linux-gnu

 # A sed program that does not truncate output.
-SED="/usr/bin/sed"
+SED="/bin/sed"

 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e 1s/^X//"

 # A grep program that handles long lines.
-GREP="/usr/bin/grep"
+GREP="/bin/grep"

 # An ERE matcher.
-EGREP="/usr/bin/grep -E"
+EGREP="/bin/grep -E"

 # A literal string matcher.
-FGREP="/usr/bin/grep -F"
+FGREP="/bin/grep -F"

 # A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm -B"
+NM="/bin/nm -B"

 # Whether we need soft or hard links.
 LN_S="ln -s"
@@ -292,7 +292,7 @@ striplib="strip --strip-unneeded"


 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"

 # How to create reloadable object files.
 reload_flag=" -r"
@@ -10093,7 +10093,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### BEGIN LIBTOOL TAG CONFIG: CXX

 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"

 # How to create reloadable object files.
 reload_flag=" -r"