fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: use the set_ld_library_path variable

Browse source 
This improves readability a little bit. set_ld_library_path was defined
but unused since commit a5e4c47f. Note that this variable must be set
*after* the OpenBSD-specific code block because its definition relies on
the value of 'paths', which is modified in said block.
This commit is contained in:
Florent Rougon 2020-06-23 19:22:45 +02:00
parent 3bce994ea8
commit 0972e57a5b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download_and_compile.sh
View file

@ -1383,7 +1383,6 @@ if _elementIn "FGFS" "${WHATTOBUILD[@]}" || \
paths="../../$SIMGEAR_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib:../../$PLIB_INSTALL_DIR/lib"
gdb="gdb"
set_ld_library_path="export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\""
common=""
common="${common}#!/bin/sh\n"
@ -1398,7 +1397,8 @@ if _elementIn "FGFS" "${WHATTOBUILD[@]}" || \
common="${common}ulimit -d 4194304\n"
fi
common="${common}export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"\n"
set_ld_library_path="export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\""
common="${common}${set_ld_library_path}\n"
SCRIPT=run_fgfs.sh
echo -en "$common" > $SCRIPT