summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskidd13 <skidd13@openttd.org>2008-07-22 22:36:07 +0000
committerskidd13 <skidd13@openttd.org>2008-07-22 22:36:07 +0000
commit9db4ea623042200a3ab3c93c76aa5ddbc868cec8 (patch)
tree05fe2732097149c25453333eab0d48c7abffd2a1
parent1b60a3522e22095fdb5b0e8b14faf195e0865eb6 (diff)
downloadopenttd-9db4ea623042200a3ab3c93c76aa5ddbc868cec8.tar.xz
(svn r13791) -Fix(r13790): Don refer to variables when their value isn't set as expected
-rw-r--r--config.lib18
1 files changed, 11 insertions, 7 deletions
diff --git a/config.lib b/config.lib
index 6831be7bc..536764d6b 100644
--- a/config.lib
+++ b/config.lib
@@ -32,13 +32,7 @@ set_default() {
personal_dir="1"
shared_dir="1"
install_dir="/"
- 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"
- menu_dir=""
- fi
+ menu_dir=""
menu_group="Game;"
enable_debug="0"
enable_desync_debug="0"
@@ -56,6 +50,7 @@ set_default() {
enable_cocoa_quickdraw="1"
with_osx_sysroot="1"
with_application_bundle="1"
+ with_menu_entry="2"
with_sdl="1"
with_cocoa="1"
with_zlib="1"
@@ -872,6 +867,15 @@ check_params() {
else
log 1 "installation directory... none"
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() {