@@ -20,57 +20,57 @@ addEnvVars() {
2020 local filename
2121
2222 for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
23− if case "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" in *"{$filename}"*) false;; *) true;; esac; then
23+ if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then
2424 export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
2525 fi
2626 done
2727
2828 local tmp="$1/lib/GNUstep/Applications"
29− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
29+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
3030 addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
3131 fi
3232 tmp="$1/lib/GNUstep/Applications"
33− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
33+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
3434 addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
3535 fi
3636 tmp="$1/lib/GNUstep/WebApplications"
37− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
37+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
3838 addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
3939 fi
4040 tmp="$1/bin"
41− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
41+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
4242 addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
4343 fi
4444 tmp="$1/sbin"
45− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
45+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
4646 addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
4747 fi
4848 tmp="$1/lib/GNUstep"
49− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
49+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then
5050 addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
5151 fi
5252 tmp="$1/include"
53− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
54− if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
53+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then
54+ if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then
5555 export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
5656 else
5757 export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
5858 fi
5959 fi
6060 tmp="$1/lib"
61− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
61+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then
6262 addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
6363 fi
6464 tmp="$1/share/GNUstep/Documentation"
65− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
65+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then
6666 addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
6767 fi
6868 tmp="$1/share/man"
69− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
69+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then
7070 addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
7171 fi
7272 tmp="$1/share/info"
73− if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
73+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then
7474 addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
7575 fi
7676}