mirror of https://github.com/OpenTTD/OpenTTD
(svn r13791) -Fix(r13790): Don refer to variables when their value isn't set as expected
parent
1b60a3522e
commit
9db4ea6230
18
config.lib
18
config.lib
|
@ -32,13 +32,7 @@ set_default() {
|
||||||
personal_dir="1"
|
personal_dir="1"
|
||||||
shared_dir="1"
|
shared_dir="1"
|
||||||
install_dir="/"
|
install_dir="/"
|
||||||
if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
|
menu_dir=""
|
||||||
with_menu_entry="1"
|
|
||||||
menu_dir="share/applications"
|
|
||||||
else
|
|
||||||
with_menu_entry="0"
|
|
||||||
menu_dir=""
|
|
||||||
fi
|
|
||||||
menu_group="Game;"
|
menu_group="Game;"
|
||||||
enable_debug="0"
|
enable_debug="0"
|
||||||
enable_desync_debug="0"
|
enable_desync_debug="0"
|
||||||
|
@ -56,6 +50,7 @@ set_default() {
|
||||||
enable_cocoa_quickdraw="1"
|
enable_cocoa_quickdraw="1"
|
||||||
with_osx_sysroot="1"
|
with_osx_sysroot="1"
|
||||||
with_application_bundle="1"
|
with_application_bundle="1"
|
||||||
|
with_menu_entry="2"
|
||||||
with_sdl="1"
|
with_sdl="1"
|
||||||
with_cocoa="1"
|
with_cocoa="1"
|
||||||
with_zlib="1"
|
with_zlib="1"
|
||||||
|
@ -872,6 +867,15 @@ check_params() {
|
||||||
else
|
else
|
||||||
log 1 "installation directory... none"
|
log 1 "installation directory... none"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$with_menu_entry" = "2" ]; then
|
||||||
|
if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
|
||||||
|
with_menu_entry="1"
|
||||||
|
menu_dir="share/applications"
|
||||||
|
else
|
||||||
|
with_menu_entry="0"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
make_cflags_and_ldflags() {
|
make_cflags_and_ldflags() {
|
||||||
|
|
Loading…
Reference in New Issue