DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2018-07-01 05:08:12 +02:00
parent b4d467977d
commit c9ca60a782
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/scripts/platform.sh
View File

@ -27,6 +27,7 @@
#variables #variables
CONFIGSH="${0%/platform.sh}/config.sh" CONFIGSH="${0%/platform.sh}/config.sh"
DESTDIR= DESTDIR=
LDSOCONF="/etc/ld.so.conf"
PREFIX="/usr/local" PREFIX="/usr/local"
PROGNAME="platform.sh" PROGNAME="platform.sh"
SOEXT=".so" SOEXT=".so"
@ -41,11 +42,11 @@ _platform_library()
libdir=$(_platform_variable "LIBDIR") libdir=$(_platform_variable "LIBDIR")
path="/lib:/usr/lib:$libdir" path="/lib:/usr/lib:$libdir"
if [ -f "$DESTDIR/etc/ld.so.conf" ]; then if [ -f "$DESTDIR$LDSOCONF" ]; then
while read line; do while read line; do
#XXX breaks on whitespace #XXX breaks on whitespace
[ -n "${line%#*}" ] && path="$path:$line" [ -n "${line%#*}" ] && path="$path:$line"
done < "$DESTDIR/etc/ld.so.conf" done < "$DESTDIR$LDSOCONF"
fi fi
(IFS=:; for p in $path; do (IFS=:; for p in $path; do
if [ -f "$DESTDIR$p/lib$library$SOEXT" ]; then if [ -f "$DESTDIR$p/lib$library$SOEXT" ]; then