gnustep: fix build
This commit is contained in:
parent
4f23da2632
commit
01ea5635fc
@ -20,57 +20,57 @@ addEnvVars() {
|
|||||||
local filename
|
local filename
|
||||||
|
|
||||||
for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
|
for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
|
||||||
if case "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" in *"{$filename}"*) false;; *) true;; esac; then
|
if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then
|
||||||
export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
|
export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
local tmp="$1/lib/GNUstep/Applications"
|
local tmp="$1/lib/GNUstep/Applications"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/lib/GNUstep/Applications"
|
tmp="$1/lib/GNUstep/Applications"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/lib/GNUstep/WebApplications"
|
tmp="$1/lib/GNUstep/WebApplications"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/bin"
|
tmp="$1/bin"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/sbin"
|
tmp="$1/sbin"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/lib/GNUstep"
|
tmp="$1/lib/GNUstep"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/include"
|
tmp="$1/include"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
|
if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then
|
||||||
export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
|
export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
|
||||||
else
|
else
|
||||||
export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
|
export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
tmp="$1/lib"
|
tmp="$1/lib"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/share/GNUstep/Documentation"
|
tmp="$1/share/GNUstep/Documentation"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/share/man"
|
tmp="$1/share/man"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
|
||||||
fi
|
fi
|
||||||
tmp="$1/share/info"
|
tmp="$1/share/info"
|
||||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
|
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
|
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user