nsnsnsns
This commit is contained in:
@@ -89,16 +89,9 @@ _ns() {
|
||||
if [[ -d "$storepath/bin" ]]; then
|
||||
export PATH="$storepath/bin${PATH:+":$PATH"}"
|
||||
fi
|
||||
if >/dev/null compgen -G "$storepath/lib/*.so"; then
|
||||
for path in "$storepath"/lib/*.so; do
|
||||
export LD_LIBRARY_PATH="${path}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}"
|
||||
done
|
||||
fi
|
||||
if >/dev/null compgen -G "$storepath/lib/*.so.*"; then
|
||||
local path
|
||||
for path in "$storepath"/lib/*.so.*; do
|
||||
export LD_LIBRARY_PATH="${path}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}"
|
||||
done
|
||||
if >/dev/null compgen -G "$storepath/lib/*.so*"; then
|
||||
export LDPATH="-L$storepath/lib${LDPATH:+" $LDPATH"}"
|
||||
export LD_LIBRARY_PATH="$storepath/lib${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}"
|
||||
export CMAKE_LIBRARY_PATH="$storepath/lib${CMAKE_LIBRARY_PATH:+":$CMAKE_LIBRARY_PATH"}"
|
||||
fi
|
||||
if [[ -d "$storepath/lib/pkgconfig" ]]; then
|
||||
@@ -113,6 +106,9 @@ _ns() {
|
||||
if [[ -d "$storepath/share/pkgconfig" ]]; then
|
||||
export PKG_CONFIG_PATH="$storepath/share/pkgconfig${PKG_CONFIG_PATH:+":$PKG_CONFIG_PATH"}"
|
||||
fi
|
||||
if [[ -d "$storepath/lib/pkgconfig" ]]; then
|
||||
export PKG_CONFIG_PATH="$storepath/lib/pkgconfig${PKG_CONFIG_PATH:+":$PKG_CONFIG_PATH"}"
|
||||
fi
|
||||
if [[ -d "$storepath/include" ]]; then
|
||||
export CPATH="$storepath/include${CPATH:+":$CPATH"}"
|
||||
export CMAKE_INCLUDE_PATH="$storepath/include${CMAKE_INCLUDE_PATH:+":$CMAKE_INCLUDE_PATH"}"
|
||||
|
||||
Reference in New Issue
Block a user